From: Eric W. Biederman <ebiederm@xmission.com>
Date: Wed, 16 Sep 2015 01:04:06 +0000 (-0500)
Subject: bridge: Introduce br_send_bpdu_finish
X-Git-Tag: android-x86-6.0-r1~454^2~329^2~13
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1f19c578df80ad2e6b2bd9af63aa0af4bcc7470e;p=android-x86%2Fkernel.git

bridge: Introduce br_send_bpdu_finish

The function dev_queue_xmit_skb_sk is unncessary and very confusing.
Introduce br_send_bpdu_finish to remove the need for dev_queue_xmit_skb_sk,
and have br_send_bpdu_finish call dev_queue_xmit.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/bridge/br_stp_bpdu.c b/net/bridge/br_stp_bpdu.c
index 534fc4cd263e..3017a396cdef 100644
--- a/net/bridge/br_stp_bpdu.c
+++ b/net/bridge/br_stp_bpdu.c
@@ -30,6 +30,11 @@
 
 #define LLC_RESERVE sizeof(struct llc_pdu_un)
 
+static int br_send_bpdu_finish(struct sock *sk, struct sk_buff *skb)
+{
+	return dev_queue_xmit(skb);
+}
+
 static void br_send_bpdu(struct net_bridge_port *p,
 			 const unsigned char *data, int length)
 {
@@ -56,7 +61,7 @@ static void br_send_bpdu(struct net_bridge_port *p,
 
 	NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, NULL, skb,
 		NULL, skb->dev,
-		dev_queue_xmit_sk);
+		br_send_bpdu_finish);
 }
 
 static inline void br_set_ticks(unsigned char *dest, int j)