Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Staging: vt6655: use net_device_ops for management functions 



vt6655: 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 7bb8dc2d

drivers/staging/vt6655/device_main.c

+11 −6
Original line number Diff line number Diff line
@@ -968,6 +968,16 @@ static BOOL device_release_WPADEV(PSDevice pDevice) 
}





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,

};





#ifndef PRIVATE_OBJ



static int
@@ -1134,12 +1144,7 @@ device_found1(struct pci_dev *pcid, const struct pci_device_id *ent) 
    pDevice->pMgmt = &(pDevice->sMgmtObj);



    dev->irq                = pcid->irq;

    dev->open               = device_open;

    dev->hard_start_xmit    = device_xmit;

    dev->stop               = device_close;

    dev->get_stats          = device_get_stats;

    dev->set_multicast_list = device_set_multi;

    dev->do_ioctl           = device_ioctl;

    dev->netdev_ops         = &device_netdev_ops;



#ifdef WIRELESS_EXT

//Einsn Modify for ubuntu-7.04

drivers/staging/vt6655/hostap.c

+6 −1
Original line number Diff line number Diff line
@@ -133,7 +133,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;