diff options
| author | Eric W. Biederman | 2015-09-15 20:04:06 -0500 |
|---|---|---|
| committer | David S. Miller | 2015-09-17 17:18:35 -0700 |
| commit | 1f19c578df80ad2e6b2bd9af63aa0af4bcc7470e (patch) | |
| tree | 617fee7bdadc51c1698d5ac7761d76e87dbfe195 /net | |
| parent | f9e4306fd87c6ff08c9a94212d84a23c16395843 (diff) | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bridge/br_stp_bpdu.c | 7 |
1 files changed, 6 insertions, 1 deletions
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) |