Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 126544
b: refs/heads/master
c: 302bae8
h: refs/heads/master
v: v3
  • Loading branch information
Pekka Enberg authored and Greg Kroah-Hartman committed Jan 6, 2009
1 parent 8d49a09 commit e1abe04
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 32 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a3379572474aad4d113985682971955ad87c8a37
refs/heads/master: 302bae8548bde90bd2e5b4f2171974c1ce7ed30f
29 changes: 2 additions & 27 deletions trunk/drivers/staging/winbond/linux/wbusb.c
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,7 @@ static const struct ieee80211_ops wbsoft_ops = {
struct wbsoft_priv {
};


// Usb kernel subsystem will call this function when a new device is plugged into.
int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id_table)
static int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id_table)
{
PADAPTER Adapter;
PWBLINUX pWbLinux;
Expand Down Expand Up @@ -334,30 +332,7 @@ WbUsb_destroy(phw_data_t pHwData)
{
}

int wb35_open(struct net_device *netdev)
{
/* netdev_priv() or netdev->ml_priv should reference to the address of
* private data(PADAPTER). It depends on whether private data memory is
* allocated when alloc_netdev().
*/
PADAPTER Adapter = (PADAPTER)netdev_priv(netdev);
phw_data_t pHwData = &Adapter->sHwData;

netif_start_queue(netdev);

//TODO : put here temporarily
hal_set_accept_broadcast(pHwData, 1); // open accept broadcast

return 0;
}

int wb35_close(struct net_device *netdev)
{
netif_stop_queue(netdev);
return 0;
}

void wb35_disconnect(struct usb_interface *intf)
static void wb35_disconnect(struct usb_interface *intf)
{
PWBLINUX pWbLinux;
PADAPTER Adapter = usb_get_intfdata(intf);
Expand Down
4 changes: 0 additions & 4 deletions trunk/drivers/staging/winbond/linux/wbusb_f.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ void WbUsb_destroy(phw_data_t pHwData);
unsigned char WbWLanInitialize(PADAPTER Adapter);
#define WbUsb_Stop( _A )

int wb35_probe(struct usb_interface *intf,const struct usb_device_id *id_table);
void wb35_disconnect(struct usb_interface *intf);


#define wb_usb_submit_urb(_A) usb_submit_urb(_A, GFP_ATOMIC)
#define wb_usb_alloc_urb(_A) usb_alloc_urb(_A, GFP_ATOMIC)

Expand Down

0 comments on commit e1abe04

Please sign in to comment.