diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-26 12:16:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-26 12:16:46 -0700 |
| commit | 2bd93d7af1581d40e3c4b25242472661cb7c637a (patch) | |
| tree | 43c638422d20857339d8d908d6b65ebb8045edc0 /net/ipv6/udp.c | |
| parent | 64cad2ade1e6f890531a58318ca9ee013f92ef2f (diff) | |
| parent | 0972ddb2373d5e127aabdcabd8305eff0242cd0b (diff) | |
| download | kernel_samsung_smdk4412-2bd93d7af1581d40e3c4b25242472661cb7c637a.zip kernel_samsung_smdk4412-2bd93d7af1581d40e3c4b25242472661cb7c637a.tar.gz kernel_samsung_smdk4412-2bd93d7af1581d40e3c4b25242472661cb7c637a.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Resolved logic conflicts causing a build failure due to
drivers/net/r8169.c changes using a patch from Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/udp.c')
| -rw-r--r-- | net/ipv6/udp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 1bdc5f0..98ecfd7 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -1335,7 +1335,7 @@ static struct sk_buff *udp6_ufo_fragment(struct sk_buff *skb, u32 features) skb->ip_summed = CHECKSUM_NONE; /* Check if there is enough headroom to insert fragment header. */ - if ((skb_headroom(skb) < frag_hdr_sz) && + if ((skb_mac_header(skb) < skb->head + frag_hdr_sz) && pskb_expand_head(skb, frag_hdr_sz, 0, GFP_ATOMIC)) goto out; |