diff -ru -x '*.ko' -x '*.o' -x '*.mod.c' -x modules.order -x '*.cmd' ibdriver-1.3.4-linux-2.6.28.orig/ib-net.c ibdriver-1.3.4-linux-2.6.28/ib-net.c --- ibdriver-1.3.4-linux-2.6.28.orig/ib-net.c 2008-12-21 02:59:29.000000000 +0200 +++ ibdriver-1.3.4-linux-2.6.28/ib-net.c 2009-10-31 09:32:57.000000000 +0200 @@ -268,7 +268,7 @@ */ static struct net_device_stats *ib_net_stats(struct net_device *netdev) { - struct ib_net_modem_t *modem = netdev->priv; + struct ib_net_modem_t *modem = netdev_priv(netdev); return &modem->stats; } @@ -279,7 +279,7 @@ */ static struct iw_statistics *ib_wireless_stats(struct net_device *netdev) { - struct ib_net_modem_t *modem = netdev->priv; + struct ib_net_modem_t *modem = netdev_priv(netdev); return &modem->wstats; } @@ -291,7 +291,7 @@ static void ib_net_tx_timeout(struct net_device *netdev) { unsigned long state; - struct ib_net_modem_t *modem = netdev->priv; + struct ib_net_modem_t *modem = netdev_priv(netdev); spin_lock_irqsave(&ib_lock, state); if (modem->driver->tx_timeout) @@ -308,7 +308,7 @@ static int ib_net_tx_start(struct sk_buff *skb, struct net_device *netdev) { unsigned long state; - struct ib_net_modem_t *modem = netdev->priv; + struct ib_net_modem_t *modem = netdev_priv(netdev); struct ib_net_ether_t *ether; struct ib_net_radio_t *radio; int nbuf, nqueue; @@ -340,7 +340,7 @@ */ static int ib_net_open(struct net_device *netdev) { - struct ib_net_modem_t *modem = netdev->priv; + struct ib_net_modem_t *modem = netdev_priv(netdev); int err; spin_lock_irq(&ib_lock); @@ -360,7 +360,7 @@ */ static int ib_net_close(struct net_device *netdev) { - struct ib_net_modem_t *modem = netdev->priv; + struct ib_net_modem_t *modem = netdev_priv(netdev); int err; spin_lock_irq(&ib_lock); @@ -427,7 +427,7 @@ static int ib_ioctl_getrate(struct net_device *dev, struct iw_request_info *info, struct iw_param *rrq, char *extra) { - struct ib_net_modem_t *modem = dev->priv; + struct ib_net_modem_t *modem = netdev_priv(dev); rrq->value = (modem->downrate <= modem->uprate ? modem->uprate : modem->downrate); @@ -486,6 +486,18 @@ #endif /** + * ib_netdev_ops - network device operations. + */ +static struct net_device_ops ib_netdev_ops = { + .ndo_get_stats = ib_net_stats, + .ndo_open = ib_net_open, + .ndo_stop = ib_net_close, + .ndo_tx_timeout = ib_net_tx_timeout, + .ndo_change_mtu = ib_net_change_mtu, + .ndo_start_xmit = ib_net_tx_start, +}; + +/** * ib_net_setup - initialize net_device structure. * @netdev: network device state. */ @@ -493,19 +505,14 @@ { ether_setup(netdev); netdev->flags = IFF_BROADCAST | IFF_DYNAMIC | IFF_NOARP; - netdev->get_stats = ib_net_stats; + netdev->netdev_ops = &ib_netdev_ops; #if WIRELESS_EXT < 17 netdev->get_wireless_stats = ib_wireless_stats; #else netdev->wireless_handlers = &ib_wireless_def; #endif - netdev->hard_start_xmit = ib_net_tx_start; - netdev->open = ib_net_open; - netdev->stop = ib_net_close; netdev->trans_start = jiffies; - netdev->tx_timeout = ib_net_tx_timeout; netdev->watchdog_timeo = 10 * HZ; - netdev->change_mtu = ib_net_change_mtu; SET_MODULE_OWNER(netdev); } @@ -523,7 +530,7 @@ ib_net_setup); if (netdev == NULL) return -ENOMEM; - modem = netdev->priv; + modem = netdev_priv(netdev); modem->netdev = netdev; modem->pc_status = 0; modem->ut_status = 0; diff -ru -x '*.ko' -x '*.o' -x '*.mod.c' -x modules.order -x '*.cmd' ibdriver-1.3.4-linux-2.6.28.orig/ib-pcmcia.c ibdriver-1.3.4-linux-2.6.28/ib-pcmcia.c --- ibdriver-1.3.4-linux-2.6.28.orig/ib-pcmcia.c 2009-05-09 11:27:37.000000000 +0200 +++ ibdriver-1.3.4-linux-2.6.28/ib-pcmcia.c 2009-10-31 09:40:12.000000000 +0200 @@ -587,7 +587,7 @@ union cisparse_t parse; unsigned char buf[64]; int version; - struct config_info_t conf; + struct socket_state_t conf; struct cistpl_cftable_entry_t *cfg; struct cistpl_cftable_entry_t dflt = { 0 }; struct win_req_t req; @@ -697,7 +697,7 @@ err = ib_net_register(&netdev); if (err) goto failed4; - modem = netdev->priv; + modem = netdev_priv(netdev); strcpy(local->node.dev_name, netdev->name); ib_net_addr(modem, local->mem + OFFSET_UT_ETHERNET); modem->driver = &ib_pcmcia_net_driver; diff -ru -x '*.ko' -x '*.o' -x '*.mod.c' -x modules.order -x '*.cmd' ibdriver-1.3.4-linux-2.6.28.orig/ib-usb.c ibdriver-1.3.4-linux-2.6.28/ib-usb.c --- ibdriver-1.3.4-linux-2.6.28.orig/ib-usb.c 2008-12-21 03:40:09.000000000 +0200 +++ ibdriver-1.3.4-linux-2.6.28/ib-usb.c 2009-10-31 09:40:31.000000000 +0200 @@ -406,7 +406,7 @@ err = ib_net_register(&netdev); if (err) goto failed; - modem = netdev->priv; + modem = netdev_priv(netdev); modem->driver = &ib_usb_net_driver; modem->pdriver = priv; priv->modem = modem;