Skip to content

Commit

Permalink
rtl8192e: use HAVE_NET_DEVICE_OPS unconditionally
Browse files Browse the repository at this point in the history
Mainline provides NET_DEVICE_OPS, remove alternate code paths and now
obsolete defines from ccflags-y.

Signed-off-by: Stefan Lippers-Hollmann <s.l-h@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Stefan Lippers-Hollmann authored and Greg Kroah-Hartman committed Nov 27, 2011
1 parent 44b6eb2 commit 71769d7
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 13 deletions.
1 change: 0 additions & 1 deletion drivers/staging/rtl8192e/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
ccflags-y += -DCONFIG_PM_RTL
ccflags-y += -DHAVE_NET_DEVICE_OPS

r8192e_pci-objs := \
rtl_core.o \
Expand Down
12 changes: 0 additions & 12 deletions drivers/staging/rtl8192e/rtl_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -2839,7 +2839,6 @@ irqreturn_type rtl8192_interrupt(int irq, void *netdev, struct pt_regs *regs)
/****************************************************************************
---------------------------- PCI_STUFF---------------------------
*****************************************************************************/
#ifdef HAVE_NET_DEVICE_OPS
static const struct net_device_ops rtl8192_netdev_ops = {
.ndo_open = rtl8192_open,
.ndo_stop = rtl8192_close,
Expand All @@ -2851,7 +2850,6 @@ static const struct net_device_ops rtl8192_netdev_ops = {
.ndo_change_mtu = eth_change_mtu,
.ndo_start_xmit = rtllib_xmit,
};
#endif

static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *id)
Expand Down Expand Up @@ -2938,17 +2936,7 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
dev->irq = pdev->irq;
priv->irq = 0;

#ifdef HAVE_NET_DEVICE_OPS
dev->netdev_ops = &rtl8192_netdev_ops;
#else
dev->open = rtl8192_open;
dev->stop = rtl8192_close;
dev->tx_timeout = rtl8192_tx_timeout;
dev->do_ioctl = rtl8192_ioctl;
dev->set_multicast_list = r8192_set_multicast;
dev->set_mac_address = r8192_set_mac_adr;
dev->hard_start_xmit = rtllib_xmit;
#endif

dev->wireless_handlers = (struct iw_handler_def *)
&r8192_wx_handlers_def;
Expand Down

0 comments on commit 71769d7

Please sign in to comment.