diff options
Diffstat (limited to 'drivers/net/wireless/ray_cs.c')
-rw-r--r-- | drivers/net/wireless/ray_cs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 22e71856aa24..b10b0383dfa5 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c | |||
@@ -923,7 +923,7 @@ static int ray_dev_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
923 | 923 | ||
924 | if (!(pcmcia_dev_present(link))) { | 924 | if (!(pcmcia_dev_present(link))) { |
925 | DEBUG(2, "ray_dev_start_xmit - device not present\n"); | 925 | DEBUG(2, "ray_dev_start_xmit - device not present\n"); |
926 | return -1; | 926 | return NETDEV_TX_LOCKED; |
927 | } | 927 | } |
928 | DEBUG(3, "ray_dev_start_xmit(skb=%p, dev=%p)\n", skb, dev); | 928 | DEBUG(3, "ray_dev_start_xmit(skb=%p, dev=%p)\n", skb, dev); |
929 | if (local->authentication_state == NEED_TO_AUTH) { | 929 | if (local->authentication_state == NEED_TO_AUTH) { |
@@ -931,7 +931,7 @@ static int ray_dev_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
931 | if (!build_auth_frame(local, local->auth_id, OPEN_AUTH_REQUEST)) { | 931 | if (!build_auth_frame(local, local->auth_id, OPEN_AUTH_REQUEST)) { |
932 | local->authentication_state = AUTHENTICATED; | 932 | local->authentication_state = AUTHENTICATED; |
933 | netif_stop_queue(dev); | 933 | netif_stop_queue(dev); |
934 | return 1; | 934 | return NETDEV_TX_BUSY; |
935 | } | 935 | } |
936 | } | 936 | } |
937 | 937 | ||
@@ -944,7 +944,7 @@ static int ray_dev_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
944 | case XMIT_NO_CCS: | 944 | case XMIT_NO_CCS: |
945 | case XMIT_NEED_AUTH: | 945 | case XMIT_NEED_AUTH: |
946 | netif_stop_queue(dev); | 946 | netif_stop_queue(dev); |
947 | return 1; | 947 | return NETDEV_TX_BUSY; |
948 | case XMIT_NO_INTR: | 948 | case XMIT_NO_INTR: |
949 | case XMIT_MSG_BAD: | 949 | case XMIT_MSG_BAD: |
950 | case XMIT_OK: | 950 | case XMIT_OK: |