From: Vlad Yasevich <vyasevic@redhat.com>
To: netdev@vger.kernel.org
Cc: Vlad Yasevich <vyasevic@redhat.com>,
shemminger@vyatta.com, bridge@lists.linux-foundation.org
Subject: [Bridge] [PATCH 2/2] bridge: use is_skb_forwardable in forward path
Date: Wed, 26 Mar 2014 12:00:27 -0400 [thread overview]
Message-ID: <1395849627-15711-4-git-send-email-vyasevic@redhat.com> (raw)
In-Reply-To: <1395849627-15711-1-git-send-email-vyasevic@redhat.com>
Use existing function instead of trying to use our own.
Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>
---
net/bridge/br_forward.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c
index d3409e6..e33d0b6 100644
--- a/net/bridge/br_forward.c
+++ b/net/bridge/br_forward.c
@@ -35,16 +35,11 @@ static inline int should_deliver(const struct net_bridge_port *p,
p->state == BR_STATE_FORWARDING;
}
-static inline unsigned int packet_length(const struct sk_buff *skb)
-{
- return skb->len - (skb->protocol == htons(ETH_P_8021Q) ? VLAN_HLEN : 0);
-}
-
int br_dev_queue_push_xmit(struct sk_buff *skb)
{
/* ip_fragment doesn't copy the MAC header */
if (nf_bridge_maybe_copy_header(skb) ||
- (packet_length(skb) > skb->dev->mtu && !skb_is_gso(skb))) {
+ !is_skb_forwardable(skb->dev, skb)) {
kfree_skb(skb);
} else {
skb_push(skb, ETH_HLEN);
--
1.8.5.3
next prev parent reply other threads:[~2014-03-26 16:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-26 16:00 [Bridge] [PATCH 0/2] bridge: Fix forwarding of 8021AD frames Vlad Yasevich
2014-03-26 16:00 ` Vlad Yasevich
2014-03-26 16:00 ` [Bridge] [PATCH 1/2] net: Allow modules to use is_skb_forwardable Vlad Yasevich
2014-03-26 21:35 ` Stephen Hemminger
2014-03-27 0:50 ` Vlad Yasevich
2014-03-26 16:00 ` Vlad Yasevich [this message]
2014-03-26 16:09 ` [Bridge] [PATCH 0/2] bridge: Fix forwarding of 8021AD frames Vlad Yasevich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1395849627-15711-4-git-send-email-vyasevic@redhat.com \
--to=vyasevic@redhat.com \
--cc=bridge@lists.linux-foundation.org \
--cc=netdev@vger.kernel.org \
--cc=shemminger@vyatta.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox