diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 20:11:44 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 20:11:44 (GMT) |
commit | b5c78e04dd061b776978dad61dd85357081147b0 (patch) | |
tree | 2416b2dc61c452c3aeb2a32bcedf15e6257be638 /drivers/staging/wlags49_h2/wl_netdev.h | |
parent | 06991c28f37ad68e5c03777f5c3b679b56e3dac1 (diff) | |
parent | 951348b377385475aa256c27e1c9e2564c9ec160 (diff) | |
download | linux-fsl-qoriq-b5c78e04dd061b776978dad61dd85357081147b0.tar.xz |
Merge tag 'staging-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging tree update from Greg Kroah-Hartman:
"Here's the big staging tree merge for 3.9-rc1
Lots of cleanups and updates for drivers all through the staging tree.
We are pretty much "code neutral" here, adding just about as many
lines as we removed.
All of these have been in linux-next for a while."
* tag 'staging-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (804 commits)
staging: comedi: vmk80xx: wait for URBs to complete
staging: comedi: drivers: addi-data: hwdrv_apci3200.c: Add a missing semicolon
staging: et131x: Update TODO list
staging: et131x: Remove assignment of skb->dev
staging: wlan-ng: hfa384x.h: fix for error reported by smatch
staging/zache checkpatch ERROR: spaces prohibited around that
staging/ozwpan: Mark read only parameters and structs as const
staging/ozwpan: Remove empty and unused function oz_cdev_heartbeat
staging/ozwpan: Mark local functions as static (fix sparse warnings)
staging/ozwpan: Add missing header includes
staging/usbip: Mark local functions as static (fix sparse warnings)
staging/xgifb: Remove duplicated code in loops.
staging/xgifb: Consolidate return paths
staging/xgifb: Remove code without effect
staging/xgifb: Remove unnecessary casts
staging/xgifb: Consolidate if/else if with identical code branches
staging: vt6656: replaced custom TRUE definition with true
staging: vt6656: replaced custom FALSE definition with false
staging: vt6656: replace custom BOOL definition with bool
staging/rtl8187se: Mark functions as static to silence sparse
...
Diffstat (limited to 'drivers/staging/wlags49_h2/wl_netdev.h')
-rw-r--r-- | drivers/staging/wlags49_h2/wl_netdev.h | 94 |
1 files changed, 47 insertions, 47 deletions
diff --git a/drivers/staging/wlags49_h2/wl_netdev.h b/drivers/staging/wlags49_h2/wl_netdev.h index 61f040f..95bfbeb 100644 --- a/drivers/staging/wlags49_h2/wl_netdev.h +++ b/drivers/staging/wlags49_h2/wl_netdev.h @@ -68,87 +68,87 @@ /******************************************************************************* * 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 ); -#endif // NEW_MULTICAST +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 */ -#endif // __WL_NETDEV_H__ +#endif /* __WL_NETDEV_H__ */ |