---

yaml --- r: 340477 b: refs/heads/master c: 342567c h: refs/heads/master i: 340475: 5e27e98 v: v3
git-mirror · Oct 26, 2012 · f9f9ab7 · f9f9ab7
1 parent 0a0e42f
commit f9f9ab7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0c075577965d1c01b30038d38bf637b027a1df3
+refs/heads/master: 342567ccf088a6c4777ef352f559fe46aaeb047e
diff --git a/trunk/net/packet/af_packet.c b/trunk/net/packet/af_packet.c
@@ -1907,7 +1907,6 @@ static int tpacket_fill_skb(struct packet_sock *po, struct sk_buff *skb,
 		to_write -= dev->hard_header_len;
 	}
 
-	err = -EFAULT;
 	offset = offset_in_page(data);
 	len_max = PAGE_SIZE - offset;
 	len = ((to_write > len_max) ? len_max : to_write);
@@ -1957,7 +1956,6 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)
 
 	mutex_lock(&po->pg_vec_lock);
 
-	err = -EBUSY;
 	if (saddr == NULL) {
 		dev = po->prot_hook.dev;
 		proto	= po->num;