diff options
| author | David S. Miller | 2014-12-10 21:48:20 +0100 |
|---|---|---|
| committer | David S. Miller | 2014-12-10 21:48:20 +0100 |
| commit | 22f10923dd39141785273e423b9acf347297e15f (patch) | |
| tree | cc1f19103817433a426b3e329d6326f5e9d8e8f7 /net/sctp | |
| parent | irda: Convert function pointer arrays and uses to const (diff) | |
| parent | net: fix suspicious rcu_dereference_check in net/sched/sch_fq_codel.c (diff) | |
| download | kernel-qcow2-linux-22f10923dd39141785273e423b9acf347297e15f.tar.gz kernel-qcow2-linux-22f10923dd39141785273e423b9acf347297e15f.tar.xz kernel-qcow2-linux-22f10923dd39141785273e423b9acf347297e15f.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/amd/xgbe/xgbe-desc.c
drivers/net/ethernet/renesas/sh_eth.c
Overlapping changes in both conflict cases.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp')
| -rw-r--r-- | net/sctp/output.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/output.c b/net/sctp/output.c index 42dffd428389..fc5e45b8a832 100644 --- a/net/sctp/output.c +++ b/net/sctp/output.c @@ -401,12 +401,12 @@ int sctp_packet_transmit(struct sctp_packet *packet) sk = chunk->skb->sk; /* Allocate the new skb. */ - nskb = alloc_skb(packet->size + LL_MAX_HEADER, GFP_ATOMIC); + nskb = alloc_skb(packet->size + MAX_HEADER, GFP_ATOMIC); if (!nskb) goto nomem; /* Make sure the outbound skb has enough header room reserved. */ - skb_reserve(nskb, packet->overhead + LL_MAX_HEADER); + skb_reserve(nskb, packet->overhead + MAX_HEADER); /* Set the owning socket so that we know where to get the * destination IP address. |