aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/airo.c14
-rw-r--r--drivers/net/wireless/arlan-main.c2
-rw-r--r--drivers/net/wireless/atmel.c6
-rw-r--r--drivers/net/wireless/mac80211_hwsim.c2
-rw-r--r--drivers/net/wireless/netwave_cs.c2
-rw-r--r--drivers/net/wireless/ray_cs.c6
-rw-r--r--drivers/net/wireless/strip.c2
-rw-r--r--drivers/net/wireless/zd1201.c4
8 files changed, 19 insertions, 19 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index c70604f0329e..49f3139a3fe7 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -1927,7 +1927,7 @@ static int mpi_start_xmit(struct sk_buff *skb, struct net_device *dev) {
1927 1927
1928 if (!skb) { 1928 if (!skb) {
1929 airo_print_err(dev->name, "%s: skb == NULL!",__func__); 1929 airo_print_err(dev->name, "%s: skb == NULL!",__func__);
1930 return 0; 1930 return NETDEV_TX_OK;
1931 } 1931 }
1932 npacks = skb_queue_len (&ai->txq); 1932 npacks = skb_queue_len (&ai->txq);
1933 1933
@@ -1938,7 +1938,7 @@ static int mpi_start_xmit(struct sk_buff *skb, struct net_device *dev) {
1938 return NETDEV_TX_BUSY; 1938 return NETDEV_TX_BUSY;
1939 } 1939 }
1940 skb_queue_tail (&ai->txq, skb); 1940 skb_queue_tail (&ai->txq, skb);
1941 return 0; 1941 return NETDEV_TX_OK;
1942 } 1942 }
1943 1943
1944 spin_lock_irqsave(&ai->aux_lock, flags); 1944 spin_lock_irqsave(&ai->aux_lock, flags);
@@ -1951,7 +1951,7 @@ static int mpi_start_xmit(struct sk_buff *skb, struct net_device *dev) {
1951 set_bit(FLAG_PENDING_XMIT, &ai->flags); 1951 set_bit(FLAG_PENDING_XMIT, &ai->flags);
1952 mpi_send_packet (dev); 1952 mpi_send_packet (dev);
1953 } 1953 }
1954 return 0; 1954 return NETDEV_TX_OK;
1955} 1955}
1956 1956
1957/* 1957/*
@@ -2127,7 +2127,7 @@ static int airo_start_xmit(struct sk_buff *skb, struct net_device *dev) {
2127 2127
2128 if ( skb == NULL ) { 2128 if ( skb == NULL ) {
2129 airo_print_err(dev->name, "%s: skb == NULL!", __func__); 2129 airo_print_err(dev->name, "%s: skb == NULL!", __func__);
2130 return 0; 2130 return NETDEV_TX_OK;
2131 } 2131 }
2132 2132
2133 /* Find a vacant FID */ 2133 /* Find a vacant FID */
@@ -2155,7 +2155,7 @@ static int airo_start_xmit(struct sk_buff *skb, struct net_device *dev) {
2155 wake_up_interruptible(&priv->thr_wait); 2155 wake_up_interruptible(&priv->thr_wait);
2156 } else 2156 } else
2157 airo_end_xmit(dev); 2157 airo_end_xmit(dev);
2158 return 0; 2158 return NETDEV_TX_OK;
2159} 2159}
2160 2160
2161static void airo_end_xmit11(struct net_device *dev) { 2161static void airo_end_xmit11(struct net_device *dev) {
@@ -2199,7 +2199,7 @@ static int airo_start_xmit11(struct sk_buff *skb, struct net_device *dev) {
2199 2199
2200 if ( skb == NULL ) { 2200 if ( skb == NULL ) {
2201 airo_print_err(dev->name, "%s: skb == NULL!", __func__); 2201 airo_print_err(dev->name, "%s: skb == NULL!", __func__);
2202 return 0; 2202 return NETDEV_TX_OK;
2203 } 2203 }
2204 2204
2205 /* Find a vacant FID */ 2205 /* Find a vacant FID */
@@ -2227,7 +2227,7 @@ static int airo_start_xmit11(struct sk_buff *skb, struct net_device *dev) {
2227 wake_up_interruptible(&priv->thr_wait); 2227 wake_up_interruptible(&priv->thr_wait);
2228 } else 2228 } else
2229 airo_end_xmit11(dev); 2229 airo_end_xmit11(dev);
2230 return 0; 2230 return NETDEV_TX_OK;
2231} 2231}
2232 2232
2233static void airo_read_stats(struct net_device *dev) 2233static void airo_read_stats(struct net_device *dev)
diff --git a/drivers/net/wireless/arlan-main.c b/drivers/net/wireless/arlan-main.c
index d84caf198a23..d479f4735aaa 100644
--- a/drivers/net/wireless/arlan-main.c
+++ b/drivers/net/wireless/arlan-main.c
@@ -1193,7 +1193,7 @@ static int arlan_tx(struct sk_buff *skb, struct net_device *dev)
1193 1193
1194 arlan_process_interrupt(dev); 1194 arlan_process_interrupt(dev);
1195 ARLAN_DEBUG_EXIT("arlan_tx"); 1195 ARLAN_DEBUG_EXIT("arlan_tx");
1196 return 0; 1196 return NETDEV_TX_OK;
1197 1197
1198bad_end: 1198bad_end:
1199 arlan_process_interrupt(dev); 1199 arlan_process_interrupt(dev);
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 291a94bd46fd..05813bc3e308 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -793,13 +793,13 @@ static int start_tx(struct sk_buff *skb, struct net_device *dev)
793 !(*priv->present_callback)(priv->card)) { 793 !(*priv->present_callback)(priv->card)) {
794 dev->stats.tx_errors++; 794 dev->stats.tx_errors++;
795 dev_kfree_skb(skb); 795 dev_kfree_skb(skb);
796 return 0; 796 return NETDEV_TX_OK;
797 } 797 }
798 798
799 if (priv->station_state != STATION_STATE_READY) { 799 if (priv->station_state != STATION_STATE_READY) {
800 dev->stats.tx_errors++; 800 dev->stats.tx_errors++;
801 dev_kfree_skb(skb); 801 dev_kfree_skb(skb);
802 return 0; 802 return NETDEV_TX_OK;
803 } 803 }
804 804
805 /* first ensure the timer func cannot run */ 805 /* first ensure the timer func cannot run */
@@ -856,7 +856,7 @@ static int start_tx(struct sk_buff *skb, struct net_device *dev)
856 spin_unlock_bh(&priv->timerlock); 856 spin_unlock_bh(&priv->timerlock);
857 dev_kfree_skb(skb); 857 dev_kfree_skb(skb);
858 858
859 return 0; 859 return NETDEV_TX_OK;
860} 860}
861 861
862static void atmel_transmit_management_frame(struct atmel_private *priv, 862static void atmel_transmit_management_frame(struct atmel_private *priv,
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index e789c6e9938c..55f77ad85304 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -314,7 +314,7 @@ static int hwsim_mon_xmit(struct sk_buff *skb, struct net_device *dev)
314{ 314{
315 /* TODO: allow packet injection */ 315 /* TODO: allow packet injection */
316 dev_kfree_skb(skb); 316 dev_kfree_skb(skb);
317 return 0; 317 return NETDEV_TX_OK;
318} 318}
319 319
320 320
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c
index d63c8992f229..712f26eef35d 100644
--- a/drivers/net/wireless/netwave_cs.c
+++ b/drivers/net/wireless/netwave_cs.c
@@ -1047,7 +1047,7 @@ static int netwave_start_xmit(struct sk_buff *skb, struct net_device *dev) {
1047 } 1047 }
1048 dev_kfree_skb(skb); 1048 dev_kfree_skb(skb);
1049 1049
1050 return 0; 1050 return NETDEV_TX_OK;
1051} /* netwave_start_xmit */ 1051} /* netwave_start_xmit */
1052 1052
1053/* 1053/*
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index b10b0383dfa5..64e574c3655c 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -937,7 +937,7 @@ static int ray_dev_start_xmit(struct sk_buff *skb, struct net_device *dev)
937 937
938 if (length < ETH_ZLEN) { 938 if (length < ETH_ZLEN) {
939 if (skb_padto(skb, ETH_ZLEN)) 939 if (skb_padto(skb, ETH_ZLEN))
940 return 0; 940 return NETDEV_TX_OK;
941 length = ETH_ZLEN; 941 length = ETH_ZLEN;
942 } 942 }
943 switch (ray_hw_xmit(skb->data, length, dev, DATA_TYPE)) { 943 switch (ray_hw_xmit(skb->data, length, dev, DATA_TYPE)) {
@@ -951,9 +951,9 @@ static int ray_dev_start_xmit(struct sk_buff *skb, struct net_device *dev)
951 default: 951 default:
952 dev->trans_start = jiffies; 952 dev->trans_start = jiffies;
953 dev_kfree_skb(skb); 953 dev_kfree_skb(skb);
954 return 0; 954 return NETDEV_TX_OK;
955 } 955 }
956 return 0; 956 return NETDEV_TX_OK;
957} /* ray_dev_start_xmit */ 957} /* ray_dev_start_xmit */
958 958
959/*===========================================================================*/ 959/*===========================================================================*/
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c
index 38366a56b71f..73300c226f67 100644
--- a/drivers/net/wireless/strip.c
+++ b/drivers/net/wireless/strip.c
@@ -1582,7 +1582,7 @@ static int strip_xmit(struct sk_buff *skb, struct net_device *dev)
1582 1582
1583 if (skb) 1583 if (skb)
1584 dev_kfree_skb(skb); 1584 dev_kfree_skb(skb);
1585 return 0; 1585 return NETDEV_TX_OK;
1586} 1586}
1587 1587
1588/* 1588/*
diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c
index 4430b8d92e21..dae1bfb7655e 100644
--- a/drivers/net/wireless/zd1201.c
+++ b/drivers/net/wireless/zd1201.c
@@ -789,7 +789,7 @@ static int zd1201_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
789 if (!zd->mac_enabled || zd->monitor) { 789 if (!zd->mac_enabled || zd->monitor) {
790 dev->stats.tx_dropped++; 790 dev->stats.tx_dropped++;
791 kfree_skb(skb); 791 kfree_skb(skb);
792 return 0; 792 return NETDEV_TX_OK;
793 } 793 }
794 netif_stop_queue(dev); 794 netif_stop_queue(dev);
795 795
@@ -826,7 +826,7 @@ static int zd1201_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
826 } 826 }
827 kfree_skb(skb); 827 kfree_skb(skb);
828 828
829 return 0; 829 return NETDEV_TX_OK;
830} 830}
831 831
832static void zd1201_tx_timeout(struct net_device *dev) 832static void zd1201_tx_timeout(struct net_device *dev)