Commit 71769d73 authored by Stefan Lippers-Hollmann's avatar Stefan Lippers-Hollmann Committed by Greg Kroah-Hartman

rtl8192e: use HAVE_NET_DEVICE_OPS unconditionally

Mainline provides NET_DEVICE_OPS, remove alternate code paths and now
obsolete defines from ccflags-y.
Signed-off-by: default avatarStefan Lippers-Hollmann <s.l-h@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 44b6eb26
ccflags-y += -DCONFIG_PM_RTL ccflags-y += -DCONFIG_PM_RTL
ccflags-y += -DHAVE_NET_DEVICE_OPS
r8192e_pci-objs := \ r8192e_pci-objs := \
rtl_core.o \ rtl_core.o \
......
...@@ -2839,7 +2839,6 @@ irqreturn_type rtl8192_interrupt(int irq, void *netdev, struct pt_regs *regs) ...@@ -2839,7 +2839,6 @@ irqreturn_type rtl8192_interrupt(int irq, void *netdev, struct pt_regs *regs)
/**************************************************************************** /****************************************************************************
---------------------------- PCI_STUFF--------------------------- ---------------------------- PCI_STUFF---------------------------
*****************************************************************************/ *****************************************************************************/
#ifdef HAVE_NET_DEVICE_OPS
static const struct net_device_ops rtl8192_netdev_ops = { static const struct net_device_ops rtl8192_netdev_ops = {
.ndo_open = rtl8192_open, .ndo_open = rtl8192_open,
.ndo_stop = rtl8192_close, .ndo_stop = rtl8192_close,
...@@ -2851,7 +2850,6 @@ static const struct net_device_ops rtl8192_netdev_ops = { ...@@ -2851,7 +2850,6 @@ static const struct net_device_ops rtl8192_netdev_ops = {
.ndo_change_mtu = eth_change_mtu, .ndo_change_mtu = eth_change_mtu,
.ndo_start_xmit = rtllib_xmit, .ndo_start_xmit = rtllib_xmit,
}; };
#endif
static int __devinit rtl8192_pci_probe(struct pci_dev *pdev, static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *id) const struct pci_device_id *id)
...@@ -2938,17 +2936,7 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev, ...@@ -2938,17 +2936,7 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
dev->irq = pdev->irq; dev->irq = pdev->irq;
priv->irq = 0; priv->irq = 0;
#ifdef HAVE_NET_DEVICE_OPS
dev->netdev_ops = &rtl8192_netdev_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 *) dev->wireless_handlers = (struct iw_handler_def *)
&r8192_wx_handlers_def; &r8192_wx_handlers_def;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment