Linux Kernels

Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge

This change “Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge” (commit 941a46a) in Linux kernel is authored by David S. Miller <davem [at] davemloft.net> on Tue Jul 10 23:31:37 2012 -0700.

Description of "Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge"

The change “Merge tag 'batman-adv-fix-for-davem' of git:git.open-mesh.org/linux-merge” introduces changes as follows. <file> Merge tag 'batman-adv-fix-for-davem' of git:git.open-mesh.org/linux-merge

Included changes: - fix a bug generated by the wrong interaction between the GW feature and the

Bridge Loop Avoidance

</file>

Linux kernel releases containing commit 941a46a

The Linux kernel releases containing this commit are as follows.

Linux kernel code changes from "Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge"

There is no are 0 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/net/ethernet/freescale/gianfar.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
 
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index f2db8fca46a1..ab1d80ff0791 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -2063,10 +2063,9 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
 			return NETDEV_TX_OK;
 		}
 
-		/* Steal sock reference for processing TX time stamps */
-		swap(skb_new->sk, skb->sk);
-		swap(skb_new->destructor, skb->destructor);
-		kfree_skb(skb);
+		if (skb->sk)
+			skb_set_owner_w(skb_new, skb->sk);
+		consume_skb(skb);
 		skb = skb_new;
 	}
 

The commit for this change in Linux stable tree is 941a46a (patch).

Last modified: 2020/01/11 10:03