diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-16 09:13:42 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-16 09:13:42 -0400 |
| commit | fcff474ea5cb17ff015aa40e92ed86fede41f1e2 (patch) | |
| tree | a99c0e14daaf31cb078812fb2fbc6abadfcd738f /net/packet/af_packet.c | |
| parent | 541b2755c2ef7dd2242ac606c115daa11e43ef69 (diff) | |
| parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) | |
Merge branch 'linux-2.6' into powerpc-next
Diffstat (limited to 'net/packet/af_packet.c')
| -rw-r--r-- | net/packet/af_packet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 25070240d4ae..2cee87da4441 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c | |||
| @@ -743,7 +743,7 @@ static int packet_sendmsg(struct kiocb *iocb, struct socket *sock, | |||
| 743 | if (len > dev->mtu+reserve) | 743 | if (len > dev->mtu+reserve) |
| 744 | goto out_unlock; | 744 | goto out_unlock; |
| 745 | 745 | ||
| 746 | skb = sock_alloc_send_skb(sk, len + LL_RESERVED_SPACE(dev), | 746 | skb = sock_alloc_send_skb(sk, len + LL_ALLOCATED_SPACE(dev), |
| 747 | msg->msg_flags & MSG_DONTWAIT, &err); | 747 | msg->msg_flags & MSG_DONTWAIT, &err); |
| 748 | if (skb==NULL) | 748 | if (skb==NULL) |
| 749 | goto out_unlock; | 749 | goto out_unlock; |