mac80211: use Probe Request template when sending a direct scan

[safe/jmp/linux-2.6] / net / appletalk / aarp.c

diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c
index 89f99d3..9d4adfd 100644 (file)
--- a/net/appletalk/aarp.c
+++ b/net/appletalk/aarp.c
@@ -599,7 +599,7 @@ int aarp_send_ddp(struct net_device *dev, struct sk_buff *skb,
 
        /* Non ELAP we cannot do. */
        if (dev->type != ARPHRD_ETHER)
-               return -1;
+               goto free_it;
 
        skb->dev = dev;
        skb->protocol = htons(ETH_P_ATALK);
@@ -634,7 +634,7 @@ int aarp_send_ddp(struct net_device *dev, struct sk_buff *skb,
        if (!a) {
                /* Whoops slipped... good job it's an unreliable protocol 8) */
                write_unlock_bh(&aarp_lock);
-               return -1;
+               goto free_it;
        }
 
        /* Set up the queue */
@@ -663,15 +663,21 @@ out_unlock:
        write_unlock_bh(&aarp_lock);
 
        /* Tell the ddp layer we have taken over for this frame. */
-       return 0;
+       goto sent;
 
 sendit:
        if (skb->sk)
                skb->priority = skb->sk->sk_priority;
-       dev_queue_xmit(skb);
+       if (dev_queue_xmit(skb))
+               goto drop;
 sent:
-       return 1;
+       return NET_XMIT_SUCCESS;
+free_it:
+       kfree_skb(skb);
+drop:
+       return NET_XMIT_DROP;
 }
+EXPORT_SYMBOL(aarp_send_ddp);
 
 /*
  *     An entry in the aarp unresolved queue has become resolved. Send