mac80211: Fix reassociation by not clearing previous BSSID

[linux-2.6-omap-h63xx.git] / net / decnet / dn_route.c

diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index 5130dee0b384023911306aaf29da23aab1a1dc30..0cc4394117dfa0a7417a35652363c5bb99e5de5a 100644 (file)
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -380,7 +380,6 @@ static int dn_return_short(struct sk_buff *skb)
        unsigned char *ptr;
        __le16 *src;
        __le16 *dst;
-       __le16 tmp;
 
        /* Add back headers */
        skb_push(skb, skb->data - skb_network_header(skb));
@@ -399,10 +398,7 @@ static int dn_return_short(struct sk_buff *skb)
        ptr += 2;
        *ptr = 0; /* Zero hop count */
 
-       /* Swap source and destination */
-       tmp  = *src;
-       *src = *dst;
-       *dst = tmp;
+       swap(*src, *dst);
 
        skb->pkt_type = PACKET_OUTGOING;
        dn_rt_finish_output(skb, NULL, NULL);