Commit eb5aaedd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networkign fixes from David Miller:
 "Networking bug fixes, Cacio e Pepe edition:

  1) BNX2X accidently accesses chip rev specific registers without an
     appropriate guard, fix from Ariel Elior.

  2) When we removed the routing cache, we set ip_rt_max_size to ~0 just
     to keep reporting a value to userspace via sysfs.  But the ipv4
     IPSEC layer was using this to tune itself which is completely bogus
     to now do.  Fix from Steffen Klassert.

  3) Missing initialization in netfilter ipset code from Jozsef
     Kadlecsik.

  4) Check CTA_TIMEOUT_NAME length properly in netfilter cttimeout code,
     fix from Florian Westphal.

  5) After removing the routing cache, we inadvertantly are caching
     multicast routes that end up looping back locally, we cannot do
     that legitimately any more.  Fix from Julian Anastasov.

  6) Revert a race fix for 8139cp qemu/kvm that doesn't actually work
     properly on real hardware.  From Francois Romieu.

  7) Fixup errors in example command lines in VXLAN device docs."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  bnx2x: remove redundant warning log
  vxlan: fix command usage in its doc
  8139cp: revert "set ring address before enabling receiver"
  ipv4: do not cache looped multicasts
  netfilter: cttimeout: fix buffer overflow
  netfilter: ipset: Fix range bug in hash:ip,port,net
  xfrm: Fix the gc threshold value for ipv4
parents f3a443af 4a25417c

Documentation/networking/vxlan.txt

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ no entry is in the forwarding table. 
  # ip link delete vxlan0



3. Show vxlan info

  # ip -d show vxlan0

  # ip -d link show vxlan0



It is possible to create, destroy and display the vxlan

forwarding table using the new bridge command.
@@ -41,7 +41,7 @@ forwarding table using the new bridge command. 
  # bridge fdb add to 00:17:42:8a:b4:05 dst 192.19.0.2 dev vxlan0



2. Delete forwarding table entry

  # bridge fdb delete 00:17:42:8a:b4:05

  # bridge fdb delete 00:17:42:8a:b4:05 dev vxlan0



3. Show forwarding table

  # bridge fdb show dev vxlan0

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+7 −4
Original line number Diff line number Diff line
@@ -9545,10 +9545,13 @@ static int __devinit bnx2x_prev_unload_common(struct bnx2x *bp) 
 */

static void __devinit bnx2x_prev_interrupted_dmae(struct bnx2x *bp)

{

	if (!CHIP_IS_E1x(bp)) {

		u32 val = REG_RD(bp, PGLUE_B_REG_PGLUE_B_INT_STS);

		if (val & PGLUE_B_PGLUE_B_INT_STS_REG_WAS_ERROR_ATTN) {

			BNX2X_ERR("was error bit was found to be set in pglueb upon startup. Clearing");

		REG_WR(bp, PGLUE_B_REG_WAS_ERROR_PF_7_0_CLR, 1 << BP_FUNC(bp));

			REG_WR(bp, PGLUE_B_REG_WAS_ERROR_PF_7_0_CLR,

			       1 << BP_FUNC(bp));

		}

	}

}

drivers/net/ethernet/realtek/8139cp.c

+11 −11
Original line number Diff line number Diff line
@@ -979,17 +979,6 @@ static void cp_init_hw (struct cp_private *cp) 
	cpw32_f (MAC0 + 0, le32_to_cpu (*(__le32 *) (dev->dev_addr + 0)));

	cpw32_f (MAC0 + 4, le32_to_cpu (*(__le32 *) (dev->dev_addr + 4)));



	cpw32_f(HiTxRingAddr, 0);

	cpw32_f(HiTxRingAddr + 4, 0);



	ring_dma = cp->ring_dma;

	cpw32_f(RxRingAddr, ring_dma & 0xffffffff);

	cpw32_f(RxRingAddr + 4, (ring_dma >> 16) >> 16);



	ring_dma += sizeof(struct cp_desc) * CP_RX_RING_SIZE;

	cpw32_f(TxRingAddr, ring_dma & 0xffffffff);

	cpw32_f(TxRingAddr + 4, (ring_dma >> 16) >> 16);



	cp_start_hw(cp);

	cpw8(TxThresh, 0x06); /* XXX convert magic num to a constant */
@@ -1003,6 +992,17 @@ static void cp_init_hw (struct cp_private *cp) 


	cpw8(Config5, cpr8(Config5) & PMEStatus);



	cpw32_f(HiTxRingAddr, 0);

	cpw32_f(HiTxRingAddr + 4, 0);



	ring_dma = cp->ring_dma;

	cpw32_f(RxRingAddr, ring_dma & 0xffffffff);

	cpw32_f(RxRingAddr + 4, (ring_dma >> 16) >> 16);



	ring_dma += sizeof(struct cp_desc) * CP_RX_RING_SIZE;

	cpw32_f(TxRingAddr, ring_dma & 0xffffffff);

	cpw32_f(TxRingAddr + 4, (ring_dma >> 16) >> 16);



	cpw16(MultiIntr, 0);



	cpw8_f(Cfg9346, Cfg9346_Lock);

include/net/xfrm.h

+1 −1
Original line number Diff line number Diff line
@@ -1351,7 +1351,7 @@ struct xfrm6_tunnel { 
};



extern void xfrm_init(void);

extern void xfrm4_init(int rt_hash_size);

extern void xfrm4_init(void);

extern int xfrm_state_init(struct net *net);

extern void xfrm_state_fini(struct net *net);

extern void xfrm4_state_init(void);

net/ipv4/route.c

+6 −3
Original line number Diff line number Diff line
@@ -1785,6 +1785,7 @@ static struct rtable *__mkroute_output(const struct fib_result *res, 
	if (dev_out->flags & IFF_LOOPBACK)

		flags |= RTCF_LOCAL;



	do_cache = true;

	if (type == RTN_BROADCAST) {

		flags |= RTCF_BROADCAST | RTCF_LOCAL;

		fi = NULL;
@@ -1793,6 +1794,8 @@ static struct rtable *__mkroute_output(const struct fib_result *res, 
		if (!ip_check_mc_rcu(in_dev, fl4->daddr, fl4->saddr,

				     fl4->flowi4_proto))

			flags &= ~RTCF_LOCAL;

		else

			do_cache = false;

		/* If multicast route do not exist use

		 * default one, but do not gateway in this case.

		 * Yes, it is hack.
@@ -1802,8 +1805,8 @@ static struct rtable *__mkroute_output(const struct fib_result *res, 
	}



	fnhe = NULL;

	do_cache = fi != NULL;

	if (fi) {

	do_cache &= fi != NULL;

	if (do_cache) {

		struct rtable __rcu **prth;

		struct fib_nh *nh = &FIB_RES_NH(*res);
@@ -2597,7 +2600,7 @@ int __init ip_rt_init(void) 
		pr_err("Unable to create route proc files\n");

#ifdef CONFIG_XFRM

	xfrm_init();

	xfrm4_init(ip_rt_max_size);

	xfrm4_init();

#endif

	rtnl_register(PF_INET, RTM_GETROUTE, inet_rtm_getroute, NULL, NULL);

CRA Git | Maintained and supported by SUSTech CRA and CCSE