Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

This commit is contained in:
David S. Miller 2016-04-09 17:41:41 -04:00
commit ae95d71261
710 changed files with 7706 additions and 4846 deletions

View file

@ -4171,7 +4171,7 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,
/* Opening a Tx-ring is NOT supported in TPACKET_V3 */
if (!closing && tx_ring && (po->tp_version > TPACKET_V2)) {
WARN(1, "Tx-ring is not supported.\n");
net_warn_ratelimited("Tx-ring is not supported.\n");
goto out;
}