Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 277901
b: refs/heads/master
c: 4ce4091
h: refs/heads/master
i:
  277899: 5cb6eaf
v: v3
  • Loading branch information
Herbert Xu authored and David S. Miller committed Nov 18, 2011
1 parent 7f155e2 commit 9690640
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 56c978f1da1f630ef18aa668a9748c6c23ab819b
refs/heads/master: 4ce4091256d61f8e9c7296f6643c8bd5bb2a00e5
3 changes: 2 additions & 1 deletion trunk/net/packet/af_packet.c
Original file line number Diff line number Diff line change
Expand Up @@ -1499,10 +1499,11 @@ static int packet_sendmsg_spkt(struct kiocb *iocb, struct socket *sock,

if (!skb) {
size_t reserved = LL_RESERVED_SPACE(dev);
int tlen = dev->needed_tailroom;
unsigned int hhlen = dev->header_ops ? dev->hard_header_len : 0;

rcu_read_unlock();
skb = sock_wmalloc(sk, len + reserved, 0, GFP_KERNEL);
skb = sock_wmalloc(sk, len + reserved + tlen, 0, GFP_KERNEL);
if (skb == NULL)
return -ENOBUFS;
/* FIXME: Save some space for broken drivers that write a hard
Expand Down

0 comments on commit 9690640

Please sign in to comment.