aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorGabor Gombas <gombasg@sztaki.hu>2009-10-29 03:19:11 -0700
committerDavid S. Miller <davem@davemloft.net>2009-10-29 03:19:11 -0700
commitb5dd884e682cae6b8c037f9d11f3b623b4cf2011 (patch)
tree224328f65e56b5d4b33078f09b397ec9e4b6ff46 /net
parent06b71b657b03c33b8d919da29f33d326f1471b39 (diff)
downloadlinux-2.6.34-ux500-b5dd884e682cae6b8c037f9d11f3b623b4cf2011.tar.gz
net: Fix 'Re: PACKET_TX_RING: packet size is too long'
Currently PACKET_TX_RING forces certain amount of every frame to remain unused. This probably originates from an early version of the PACKET_TX_RING patch that in fact used the extra space when the (since removed) CONFIG_PACKET_MMAP_ZERO_COPY option was enabled. The current code does not make any use of this extra space. This patch removes the extra space reservation and lets userspace make use of the full frame size. Signed-off-by: Gabor Gombas <gombasg@sztaki.hu> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/packet/af_packet.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 1238949e66a..48b18dad676 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -982,10 +982,7 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)
goto out_put;
size_max = po->tx_ring.frame_size
- - sizeof(struct skb_shared_info)
- - po->tp_hdrlen
- - LL_ALLOCATED_SPACE(dev)
- - sizeof(struct sockaddr_ll);
+ - (po->tp_hdrlen - sizeof(struct sockaddr_ll));
if (size_max > dev->mtu + reserve)
size_max = dev->mtu + reserve;