projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ARM] nommu: abort handler fixup for !CPU_CP15_MMU cores.
[powerpc.git]
/
net
/
bridge
/
br_forward.c
diff --git
a/net/bridge/br_forward.c
b/net/bridge/br_forward.c
index
0dca027
..
864fbbc
100644
(file)
--- a/
net/bridge/br_forward.c
+++ b/
net/bridge/br_forward.c
@@
-34,17
+34,21
@@
static inline unsigned packet_length(const struct sk_buff *skb)
int br_dev_queue_push_xmit(struct sk_buff *skb)
{
int br_dev_queue_push_xmit(struct sk_buff *skb)
{
- /* drop mtu oversized packets except
t
so */
- if (packet_length(skb) > skb->dev->mtu && !skb_
shinfo(skb)->tso_size
)
+ /* drop mtu oversized packets except
g
so */
+ if (packet_length(skb) > skb->dev->mtu && !skb_
is_gso(skb)
)
kfree_skb(skb);
else {
#ifdef CONFIG_BRIDGE_NETFILTER
/* ip_refrag calls ip_fragment, doesn't copy the MAC header. */
kfree_skb(skb);
else {
#ifdef CONFIG_BRIDGE_NETFILTER
/* ip_refrag calls ip_fragment, doesn't copy the MAC header. */
- nf_bridge_maybe_copy_header(skb);
+ if (nf_bridge_maybe_copy_header(skb))
+ kfree_skb(skb);
+ else
#endif
#endif
- skb_push(skb, ETH_HLEN);
+ {
+ skb_push(skb, ETH_HLEN);
- dev_queue_xmit(skb);
+ dev_queue_xmit(skb);
+ }
}
return 0;
}
return 0;