Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

1 files changed, 1 insertions, 4 deletions

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 33e68f20ec61..95ef64e4189a 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -984,10 +984,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;