aboutsummaryrefslogtreecommitdiffstats
path: root/net/packet
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-26 18:33:26 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-26 18:33:26 -0700
commit5c1f4cac6ff75a4a602bae960a054ed3df7e9765 (patch)
tree31b0b05a41345e9dbf802a309ddf21eb506e8550 /net/packet
parentc6a519d2aac024d8ca5658bddd78af474b274e4b (diff)
parent56e9b263242ca80a70abd8831343b268315c27dc (diff)
downloadkernel_samsung_smdk4412-5c1f4cac6ff75a4a602bae960a054ed3df7e9765.zip
kernel_samsung_smdk4412-5c1f4cac6ff75a4a602bae960a054ed3df7e9765.tar.gz
kernel_samsung_smdk4412-5c1f4cac6ff75a4a602bae960a054ed3df7e9765.tar.bz2
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/packet')
-rw-r--r--net/packet/af_packet.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index ee865d8..6a67a87 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -761,12 +761,6 @@ static int packet_sendmsg(struct kiocb *iocb, struct socket *sock,
if (dev->hard_header) {
int res;
err = -EINVAL;
- if (saddr) {
- if (saddr->sll_halen != dev->addr_len)
- goto out_free;
- if (saddr->sll_hatype != dev->type)
- goto out_free;
- }
res = dev->hard_header(skb, dev, ntohs(proto), addr, NULL, len);
if (sock->type != SOCK_DGRAM) {
skb->tail = skb->data;