From 6868708261975b02747eef7f2b063eca066fb09d Mon Sep 17 00:00:00 2001 From: "danborkmann@iogearbox.net" Date: Mon, 20 Aug 2012 03:34:03 +0000 Subject: [PATCH] --- yaml --- r: 327590 b: refs/heads/master c: 9e67030af367ab524d0856af9e992de241eca3c7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/packet/af_packet.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0217e0b692b0..a967767c1802 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bfdc587c5af4ff155cf702b972e8fcd66d77d5f2 +refs/heads/master: 9e67030af367ab524d0856af9e992de241eca3c7 diff --git a/trunk/net/packet/af_packet.c b/trunk/net/packet/af_packet.c index fe0912f161ce..bfaa0a83f0eb 100644 --- a/trunk/net/packet/af_packet.c +++ b/trunk/net/packet/af_packet.c @@ -855,7 +855,8 @@ static void prb_fill_vlan_info(struct tpacket_kbdq_core *pkc, ppd->hv1.tp_vlan_tci = vlan_tx_tag_get(pkc->skb); ppd->tp_status = TP_STATUS_VLAN_VALID; } else { - ppd->hv1.tp_vlan_tci = ppd->tp_status = 0; + ppd->hv1.tp_vlan_tci = 0; + ppd->tp_status = TP_STATUS_AVAILABLE; } } @@ -1951,7 +1952,7 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) int tp_len, size_max; unsigned char *addr; int len_sum = 0; - int status = 0; + int status = TP_STATUS_AVAILABLE; int hlen, tlen; mutex_lock(&po->pg_vec_lock);