Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 353852
b: refs/heads/master
c: 79249c4
h: refs/heads/master
v: v3
  • Loading branch information
Johan Meiring authored and Greg Kroah-Hartman committed Jan 7, 2013
1 parent 6b52f16 commit e8a9185
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 46 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2dddc56293a4c03a8fe549089aee21f9e63b60c7
refs/heads/master: 79249c4b22a56fda44623f449a2893f25629a7d1
90 changes: 45 additions & 45 deletions trunk/drivers/staging/wlags49_h2/wl_netdev.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,85 +68,85 @@
/*******************************************************************************
* function prototypes
******************************************************************************/
int wl_init( struct net_device *dev );
int wl_init(struct net_device *dev);

int wl_config( struct net_device *dev, struct ifmap *map );
int wl_config(struct net_device *dev, struct ifmap *map);

struct net_device *wl_device_alloc( void );
struct net_device *wl_device_alloc(void);

void wl_device_dealloc( struct net_device *dev );
void wl_device_dealloc(struct net_device *dev);

int wl_open( struct net_device *dev );
int wl_open(struct net_device *dev);

int wl_close( struct net_device *dev );
int wl_close(struct net_device *dev);

int wl_ioctl( struct net_device *dev, struct ifreq *rq, int cmd );
int wl_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);

int wl_tx( struct sk_buff *skb, struct net_device *dev, int port );
int wl_tx(struct sk_buff *skb, struct net_device *dev, int port);

int wl_send( struct wl_private *lp );
int wl_send(struct wl_private *lp);

int wl_rx( struct net_device *dev );
int wl_rx(struct net_device *dev);

void wl_tx_timeout( struct net_device *dev );
void wl_tx_timeout(struct net_device *dev);

struct net_device_stats *wl_stats( struct net_device *dev );
struct net_device_stats *wl_stats(struct net_device *dev);


#ifdef ENABLE_DMA
int wl_send_dma( struct wl_private *lp, struct sk_buff *skb, int port );
int wl_rx_dma( struct net_device *dev );
int wl_send_dma(struct wl_private *lp, struct sk_buff *skb, int port);
int wl_rx_dma(struct net_device *dev);
#endif

#ifdef NEW_MULTICAST
void wl_multicast( struct net_device *dev );
void wl_multicast(struct net_device *dev);
#else
void wl_multicast( struct net_device *dev, int num_addrs, void *addrs );
void wl_multicast(struct net_device *dev, int num_addrs, void *addrs);
#endif /* NEW_MULTICAST */


int wl_tx_port0( struct sk_buff *skb, struct net_device *dev );
int wl_tx_port0(struct sk_buff *skb, struct net_device *dev);


#ifdef USE_WDS

int wl_tx_port1( struct sk_buff *skb, struct net_device *dev );
int wl_tx_port2( struct sk_buff *skb, struct net_device *dev );
int wl_tx_port3( struct sk_buff *skb, struct net_device *dev );
int wl_tx_port4( struct sk_buff *skb, struct net_device *dev );
int wl_tx_port5( struct sk_buff *skb, struct net_device *dev );
int wl_tx_port6( struct sk_buff *skb, struct net_device *dev );

void wl_wds_device_alloc( struct wl_private *lp );
void wl_wds_device_dealloc( struct wl_private *lp );
void wl_wds_netif_start_queue( struct wl_private *lp );
void wl_wds_netif_stop_queue( struct wl_private *lp );
void wl_wds_netif_wake_queue( struct wl_private *lp );
void wl_wds_netif_carrier_on( struct wl_private *lp );
void wl_wds_netif_carrier_off( struct wl_private *lp );
int wl_tx_port1(struct sk_buff *skb, struct net_device *dev);
int wl_tx_port2(struct sk_buff *skb, struct net_device *dev);
int wl_tx_port3(struct sk_buff *skb, struct net_device *dev);
int wl_tx_port4(struct sk_buff *skb, struct net_device *dev);
int wl_tx_port5(struct sk_buff *skb, struct net_device *dev);
int wl_tx_port6(struct sk_buff *skb, struct net_device *dev);

void wl_wds_device_alloc(struct wl_private *lp);
void wl_wds_device_dealloc(struct wl_private *lp);
void wl_wds_netif_start_queue(struct wl_private *lp);
void wl_wds_netif_stop_queue(struct wl_private *lp);
void wl_wds_netif_wake_queue(struct wl_private *lp);
void wl_wds_netif_carrier_on(struct wl_private *lp);
void wl_wds_netif_carrier_off(struct wl_private *lp);

#endif /* USE_WDS */


#ifdef USE_WDS

#define WL_WDS_DEVICE_ALLOC( ARG ) wl_wds_device_alloc( ARG )
#define WL_WDS_DEVICE_DEALLOC( ARG ) wl_wds_device_dealloc( ARG )
#define WL_WDS_NETIF_START_QUEUE( ARG ) wl_wds_netif_start_queue( ARG )
#define WL_WDS_NETIF_STOP_QUEUE( ARG ) wl_wds_netif_stop_queue( ARG )
#define WL_WDS_NETIF_WAKE_QUEUE( ARG ) wl_wds_netif_wake_queue( ARG )
#define WL_WDS_NETIF_CARRIER_ON( ARG ) wl_wds_netif_carrier_on( ARG )
#define WL_WDS_NETIF_CARRIER_OFF( ARG ) wl_wds_netif_carrier_off( ARG )
#define WL_WDS_DEVICE_ALLOC(ARG) wl_wds_device_alloc(ARG)
#define WL_WDS_DEVICE_DEALLOC(ARG) wl_wds_device_dealloc(ARG)
#define WL_WDS_NETIF_START_QUEUE(ARG) wl_wds_netif_start_queue(ARG)
#define WL_WDS_NETIF_STOP_QUEUE(ARG) wl_wds_netif_stop_queue(ARG)
#define WL_WDS_NETIF_WAKE_QUEUE(ARG) wl_wds_netif_wake_queue(ARG)
#define WL_WDS_NETIF_CARRIER_ON(ARG) wl_wds_netif_carrier_on(ARG)
#define WL_WDS_NETIF_CARRIER_OFF(ARG) wl_wds_netif_carrier_off(ARG)

#else

#define WL_WDS_DEVICE_ALLOC( ARG )
#define WL_WDS_DEVICE_DEALLOC( ARG )
#define WL_WDS_NETIF_START_QUEUE( ARG )
#define WL_WDS_NETIF_STOP_QUEUE( ARG )
#define WL_WDS_NETIF_WAKE_QUEUE( ARG )
#define WL_WDS_NETIF_CARRIER_ON( ARG )
#define WL_WDS_NETIF_CARRIER_OFF( ARG )
#define WL_WDS_DEVICE_ALLOC(ARG)
#define WL_WDS_DEVICE_DEALLOC(ARG)
#define WL_WDS_NETIF_START_QUEUE(ARG)
#define WL_WDS_NETIF_STOP_QUEUE(ARG)
#define WL_WDS_NETIF_WAKE_QUEUE(ARG)
#define WL_WDS_NETIF_CARRIER_ON(ARG)
#define WL_WDS_NETIF_CARRIER_OFF(ARG)

#endif /* USE_WDS */

Expand Down

0 comments on commit e8a9185

Please sign in to comment.