Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=299f59...
Commit:     299f590f26da9764f20e905879f0090552ff2e86
Parent:     505a41d43c24345f3fa77ddab152d1f82dd8264d
Author:     Julia Lawall <julia@diku.dk>
AuthorDate: Mon Dec 10 17:16:56 2007 -0800
Committer:  David S. Miller <davem@sunset.davemloft.net>
CommitDate: Tue Dec 11 02:45:28 2007 -0800

    [XTENSA]: Fix use of skb after netif_rx
    
    Recently, Wang Chen submitted a patch
    (d30f53aeb31d453a5230f526bea592af07944564) to move a call to netif_rx(skb)
    after a subsequent reference to skb, because netif_rx may call kfree_skb on
    its argument.  The same problem occurs in some other drivers as well.
    
    This was found using the following semantic match.
    (http://www.emn.fr/x-info/coccinelle/)
    
    // <smpl>
    @@
    expression skb, e,e1;
    @@
    
    (
     netif_rx(skb);
    |
     netif_rx_ni(skb);
    )
      ... when != skb = e
    (
      skb = e1
    |
    * skb
    )
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Signed-off-by: David S. Miller <davem@davemloft.net>
---
 arch/xtensa/platform-iss/network.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/xtensa/platform-iss/network.c b/arch/xtensa/platform-iss/network.c
index b61fb36..f21b9b0 100644
--- a/arch/xtensa/platform-iss/network.c
+++ b/arch/xtensa/platform-iss/network.c
@@ -393,11 +393,11 @@ static int iss_net_rx(struct net_device *dev)
 	if (pkt_len > 0) {
 		skb_trim(skb, pkt_len);
 		skb->protocol = lp->tp.protocol(skb);
-	//	netif_rx(skb);
-		netif_rx_ni(skb);
 
 		lp->stats.rx_bytes += skb->len;
 		lp->stats.rx_packets++;
+	//	netif_rx(skb);
+		netif_rx_ni(skb);
 		return pkt_len;
 	}
 	kfree_skb(skb);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html