Commit dd8db704 authored by Forest Bond's avatar Forest Bond Committed by Greg Kroah-Hartman
Browse files

Staging: vt6656: use net_device_ops for management functions 



vt6656: use net_device_ops for management functions

Signed-off-by: default avatarForest Bond <forest@alittletooquiet.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1e28efa3

drivers/staging/vt6656/hostap.c

+6 −1
Original line number Diff line number Diff line
@@ -117,7 +117,12 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked) 
    apdev_priv = netdev_priv(pDevice->apdev);

    *apdev_priv = *pDevice;

	memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);

	pDevice->apdev->hard_start_xmit = pDevice->tx_80211;



	const struct net_device_ops apdev_netdev_ops = {

		.ndo_start_xmit         = pDevice->tx_80211,

	};

	pDevice->apdev->netdev_ops = &apdev_netdev_ops;



	pDevice->apdev->type = ARPHRD_IEEE80211;



	pDevice->apdev->base_addr = dev->base_addr;

drivers/staging/vt6656/main_usb.c

+13 −6
Original line number Diff line number Diff line
@@ -837,6 +837,17 @@ static int vntwusb_resume(struct usb_interface *intf) 
}

#endif





static const struct net_device_ops device_netdev_ops = {

    .ndo_open               = device_open,

    .ndo_stop               = device_close,

    .ndo_do_ioctl           = device_ioctl,

    .ndo_get_stats          = device_get_stats,

    .ndo_start_xmit         = device_xmit,

    .ndo_set_multicast_list = device_set_multi,

};





#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)



static int
@@ -896,12 +907,8 @@ vntwusb_found1(struct usb_device *udev, UINT interface, const struct usb_device_ 
    pDevice->tx_80211 = device_dma0_tx_80211;

    pDevice->sMgmtObj.pAdapter = (PVOID)pDevice;



    netdev->open               = device_open;

    netdev->hard_start_xmit    = device_xmit;

    netdev->stop               = device_close;

    netdev->get_stats          = device_get_stats;

    netdev->set_multicast_list = device_set_multi;

    netdev->do_ioctl           = device_ioctl;

    netdev->netdev_ops         = &device_netdev_ops;



#ifdef WIRELESS_EXT



//2007-0508-01<Add>by MikeLiu