diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-12-14 19:29:00 (GMT) |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-12-14 19:31:16 (GMT) |
commit | a4ec80082c82f3fda775d13b2a72aac38248ced6 (patch) | |
tree | 23affbe49c629cbbdb5553ca78aa444a7ccf2ead /net/wireless/lib80211_crypt_tkip.c | |
parent | 19576c9478682a398276c994ea0d2696474df32b (diff) | |
parent | cb4396edd84ed73081635fb933d19c1410fafaf4 (diff) | |
download | linux-a4ec80082c82f3fda775d13b2a72aac38248ced6.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
Resolve conflict between commit 264640fc2c5f4f ("ipv6: distinguish frag
queues by device for multicast and link-local packets") from the net
tree and commit 029f7f3b8701c ("netfilter: ipv6: nf_defrag: avoid/free
clone operations") from the nf-next tree.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Conflicts:
net/ipv6/netfilter/nf_conntrack_reasm.c
Diffstat (limited to 'net/wireless/lib80211_crypt_tkip.c')
-rw-r--r-- | net/wireless/lib80211_crypt_tkip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/lib80211_crypt_tkip.c b/net/wireless/lib80211_crypt_tkip.c index 8c90ba7..3cd8195 100644 --- a/net/wireless/lib80211_crypt_tkip.c +++ b/net/wireless/lib80211_crypt_tkip.c @@ -434,8 +434,8 @@ static int lib80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) } keyidx >>= 6; if (tkey->key_idx != keyidx) { - printk(KERN_DEBUG "TKIP: RX tkey->key_idx=%d frame " - "keyidx=%d priv=%p\n", tkey->key_idx, keyidx, priv); + net_dbg_ratelimited("TKIP: RX tkey->key_idx=%d frame keyidx=%d\n", + tkey->key_idx, keyidx); return -6; } if (!tkey->key_set) { |