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

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (24 commits)
  xfrm: Add security check before flushing SAD/SPD
  [NET_SCHED]: Fix filter double free
  [NET]: Avoid duplicate netlink notification when changing link state
  [UDP]: Revert 2-pass hashing changes.
  [AF_UNIX]: Fix stream recvmsg() race.
  [NETFILTER]: nf_conntrack_amanda: fix textsearch_prepare() error check
  [NETFILTER]: ip_tables: fix compat related crash
  [NETFILTER]: nf_conntrack: fix helper module unload races
  [RTNETLINK]: ifindex 0 does not exist
  [NETLINK]: Mark netlink policies const
  [TCP] tcp_probe: Attach printf attribute properly to printl().
  [TCP]: Use LIMIT_NETDEBUG in tcp_retransmit_timer().
  [NET]: Merge dst_discard_in and dst_discard_out.
  [RFKILL]: Make rfkill->name const
  [IPV4]: Restore old behaviour of default config values
  [IPV4]: Add default config support after inetdev_init
  [IPV4]: Convert IPv4 devconf to an array
  [IPV4]: Only panic if inetdev_init fails for loopback
  [TCP]: Honour sk_bound_dev_if in tcp_v4_send_ack
  [BNX2]: Update version and reldate.
  ...
parents e5e3c84b 4aa2e62c

drivers/infiniband/hw/amso1100/c2.c

+1 −1
Original line number Diff line number Diff line
@@ -672,7 +672,7 @@ static int c2_up(struct net_device *netdev) 
	 * rdma interface.

	 */

	in_dev = in_dev_get(netdev);

	in_dev->cnf.arp_ignore = 1;

	IN_DEV_CONF_SET(in_dev, ARP_IGNORE, 1);

	in_dev_put(in_dev);



	return 0;

drivers/net/bnx2.c

+47 −14
Original line number Diff line number Diff line
@@ -54,8 +54,8 @@ 


#define DRV_MODULE_NAME		"bnx2"

#define PFX DRV_MODULE_NAME	": "

#define DRV_MODULE_VERSION	"1.5.10"

#define DRV_MODULE_RELDATE	"May 1, 2007"

#define DRV_MODULE_VERSION	"1.5.11"

#define DRV_MODULE_RELDATE	"June 4, 2007"



#define RUN_AT(x) (jiffies + (x))
@@ -1778,6 +1778,15 @@ bnx2_init_5709_context(struct bnx2 *bp) 
	val = BNX2_CTX_COMMAND_ENABLED | BNX2_CTX_COMMAND_MEM_INIT | (1 << 12);

	val |= (BCM_PAGE_BITS - 8) << 16;

	REG_WR(bp, BNX2_CTX_COMMAND, val);

	for (i = 0; i < 10; i++) {

		val = REG_RD(bp, BNX2_CTX_COMMAND);

		if (!(val & BNX2_CTX_COMMAND_MEM_INIT))

			break;

		udelay(2);

	}

	if (val & BNX2_CTX_COMMAND_MEM_INIT)

		return -EBUSY;



	for (i = 0; i < bp->ctx_pages; i++) {

		int j;
@@ -1811,6 +1820,7 @@ bnx2_init_context(struct bnx2 *bp) 
	vcid = 96;

	while (vcid) {

		u32 vcid_addr, pcid_addr, offset;

		int i;



		vcid--;
@@ -1831,18 +1841,22 @@ bnx2_init_context(struct bnx2 *bp) 
			pcid_addr = vcid_addr;

		}



		for (i = 0; i < (CTX_SIZE / PHY_CTX_SIZE); i++) {

			vcid_addr += (i << PHY_CTX_SHIFT);

			pcid_addr += (i << PHY_CTX_SHIFT);



			REG_WR(bp, BNX2_CTX_VIRT_ADDR, 0x00);

			REG_WR(bp, BNX2_CTX_PAGE_TBL, pcid_addr);



			/* Zero out the context. */

		for (offset = 0; offset < PHY_CTX_SIZE; offset += 4) {

			for (offset = 0; offset < PHY_CTX_SIZE; offset += 4)

				CTX_WR(bp, 0x00, offset, 0);

		}



			REG_WR(bp, BNX2_CTX_VIRT_ADDR, vcid_addr);

			REG_WR(bp, BNX2_CTX_PAGE_TBL, pcid_addr);

		}

	}

}



static int

bnx2_alloc_bad_rbuf(struct bnx2 *bp)
@@ -3691,9 +3705,11 @@ bnx2_init_chip(struct bnx2 *bp) 


	/* Initialize context mapping and zero out the quick contexts.  The

	 * context block must have already been enabled. */

	if (CHIP_NUM(bp) == CHIP_NUM_5709)

		bnx2_init_5709_context(bp);

	else

	if (CHIP_NUM(bp) == CHIP_NUM_5709) {

		rc = bnx2_init_5709_context(bp);

		if (rc)

			return rc;

	} else

		bnx2_init_context(bp);



	if ((rc = bnx2_init_cpus(bp)) != 0)
@@ -3772,6 +3788,9 @@ bnx2_init_chip(struct bnx2 *bp) 
	REG_WR(bp, BNX2_HC_CMD_TICKS,

	       (bp->cmd_ticks_int << 16) | bp->cmd_ticks);



	if (CHIP_NUM(bp) == CHIP_NUM_5708)

		REG_WR(bp, BNX2_HC_STATS_TICKS, 0);

	else

		REG_WR(bp, BNX2_HC_STATS_TICKS, bp->stats_ticks & 0xffff00);

	REG_WR(bp, BNX2_HC_STAT_COLLECT_TICKS, 0xbb8);  /* 3ms */
@@ -3799,6 +3818,11 @@ bnx2_init_chip(struct bnx2 *bp) 
	/* Initialize the receive filter. */

	bnx2_set_rx_mode(bp->dev);



	if (CHIP_NUM(bp) == CHIP_NUM_5709) {

		val = REG_RD(bp, BNX2_MISC_NEW_CORE_CTL);

		val |= BNX2_MISC_NEW_CORE_CTL_DMA_ENABLE;

		REG_WR(bp, BNX2_MISC_NEW_CORE_CTL, val);

	}

	rc = bnx2_fw_sync(bp, BNX2_DRV_MSG_DATA_WAIT2 | BNX2_DRV_MSG_CODE_RESET,

			  0);
@@ -4620,6 +4644,11 @@ bnx2_timer(unsigned long data) 


	bp->stats_blk->stat_FwRxDrop = REG_RD_IND(bp, BNX2_FW_RX_DROP_COUNT);



	/* workaround occasional corrupted counters */

	if (CHIP_NUM(bp) == CHIP_NUM_5708 && bp->stats_ticks)

		REG_WR(bp, BNX2_HC_COMMAND, bp->hc_cmd |

					    BNX2_HC_COMMAND_STATS_NOW);



	if (bp->phy_flags & PHY_SERDES_FLAG) {

		if (CHIP_NUM(bp) == CHIP_NUM_5706)

			bnx2_5706_serdes_timer(bp);
@@ -5417,6 +5446,10 @@ bnx2_set_coalesce(struct net_device *dev, struct ethtool_coalesce *coal) 
		0xff;



	bp->stats_ticks = coal->stats_block_coalesce_usecs;

	if (CHIP_NUM(bp) == CHIP_NUM_5708) {

		if (bp->stats_ticks != 0 && bp->stats_ticks != USEC_PER_SEC)

			bp->stats_ticks = USEC_PER_SEC;

	}

	if (bp->stats_ticks > 0xffff00) bp->stats_ticks = 0xffff00;

	bp->stats_ticks &= 0xffff00;

drivers/net/bnx2.h

+1 −0
Original line number Diff line number Diff line
@@ -1373,6 +1373,7 @@ struct l2_fhdr { 
#define BNX2_MISC_NEW_CORE_CTL				0x000008c8

#define BNX2_MISC_NEW_CORE_CTL_LINK_HOLDOFF_SUCCESS	 (1L<<0)

#define BNX2_MISC_NEW_CORE_CTL_LINK_HOLDOFF_REQ		 (1L<<1)

#define BNX2_MISC_NEW_CORE_CTL_DMA_ENABLE		 (1L<<16)

#define BNX2_MISC_NEW_CORE_CTL_RESERVED_CMN		 (0x3fffL<<2)

#define BNX2_MISC_NEW_CORE_CTL_RESERVED_TC		 (0xffffL<<16)

include/linux/inetdevice.h

+62 −41
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#ifdef __KERNEL__



#include <linux/bitmap.h>

#include <linux/if.h>

#include <linux/netdevice.h>

#include <linux/rcupdate.h>
@@ -10,28 +11,9 @@ 


struct ipv4_devconf

{

	int	accept_redirects;

	int	send_redirects;

	int	secure_redirects;

	int	shared_media;

	int	accept_source_route;

	int	rp_filter;

	int	proxy_arp;

	int	bootp_relay;

	int	log_martians;

	int	forwarding;

	int	mc_forwarding;

	int	tag;

	int     arp_filter;

	int	arp_announce;

	int	arp_ignore;

	int	arp_accept;

	int	medium_id;

	int	no_xfrm;

	int	no_policy;

	int	force_igmp_version;

	int	promote_secondaries;

	void	*sysctl;

	int	data[__NET_IPV4_CONF_MAX - 1];

	DECLARE_BITMAP(state, __NET_IPV4_CONF_MAX - 1);

};



extern struct ipv4_devconf ipv4_devconf;
@@ -60,30 +42,70 @@ struct in_device 
	struct rcu_head		rcu_head;

};



#define IN_DEV_FORWARD(in_dev)		((in_dev)->cnf.forwarding)

#define IN_DEV_MFORWARD(in_dev)		(ipv4_devconf.mc_forwarding && (in_dev)->cnf.mc_forwarding)

#define IN_DEV_RPFILTER(in_dev)		(ipv4_devconf.rp_filter && (in_dev)->cnf.rp_filter)

#define IN_DEV_SOURCE_ROUTE(in_dev)	(ipv4_devconf.accept_source_route && (in_dev)->cnf.accept_source_route)

#define IN_DEV_BOOTP_RELAY(in_dev)	(ipv4_devconf.bootp_relay && (in_dev)->cnf.bootp_relay)



#define IN_DEV_LOG_MARTIANS(in_dev)	(ipv4_devconf.log_martians || (in_dev)->cnf.log_martians)

#define IN_DEV_PROXY_ARP(in_dev)	(ipv4_devconf.proxy_arp || (in_dev)->cnf.proxy_arp)

#define IN_DEV_SHARED_MEDIA(in_dev)	(ipv4_devconf.shared_media || (in_dev)->cnf.shared_media)

#define IN_DEV_TX_REDIRECTS(in_dev)	(ipv4_devconf.send_redirects || (in_dev)->cnf.send_redirects)

#define IN_DEV_SEC_REDIRECTS(in_dev)	(ipv4_devconf.secure_redirects || (in_dev)->cnf.secure_redirects)

#define IN_DEV_IDTAG(in_dev)		((in_dev)->cnf.tag)

#define IN_DEV_MEDIUM_ID(in_dev)	((in_dev)->cnf.medium_id)

#define IN_DEV_PROMOTE_SECONDARIES(in_dev)	(ipv4_devconf.promote_secondaries || (in_dev)->cnf.promote_secondaries)

#define IPV4_DEVCONF(cnf, attr) ((cnf).data[NET_IPV4_CONF_ ## attr - 1])

#define IPV4_DEVCONF_ALL(attr) IPV4_DEVCONF(ipv4_devconf, attr)



static inline int ipv4_devconf_get(struct in_device *in_dev, int index)

{

	index--;

	return in_dev->cnf.data[index];

}



static inline void ipv4_devconf_set(struct in_device *in_dev, int index,

				    int val)

{

	index--;

	set_bit(index, in_dev->cnf.state);

	in_dev->cnf.data[index] = val;

}



static inline void ipv4_devconf_setall(struct in_device *in_dev)

{

	bitmap_fill(in_dev->cnf.state, __NET_IPV4_CONF_MAX - 1);

}



#define IN_DEV_CONF_GET(in_dev, attr) \

	ipv4_devconf_get((in_dev), NET_IPV4_CONF_ ## attr)

#define IN_DEV_CONF_SET(in_dev, attr, val) \

	ipv4_devconf_set((in_dev), NET_IPV4_CONF_ ## attr, (val))



#define IN_DEV_ANDCONF(in_dev, attr) \

	(IPV4_DEVCONF_ALL(attr) && IN_DEV_CONF_GET((in_dev), attr))

#define IN_DEV_ORCONF(in_dev, attr) \

	(IPV4_DEVCONF_ALL(attr) || IN_DEV_CONF_GET((in_dev), attr))

#define IN_DEV_MAXCONF(in_dev, attr) \

	(max(IPV4_DEVCONF_ALL(attr), IN_DEV_CONF_GET((in_dev), attr)))



#define IN_DEV_FORWARD(in_dev)		IN_DEV_CONF_GET((in_dev), FORWARDING)

#define IN_DEV_MFORWARD(in_dev)		(IPV4_DEVCONF_ALL(MC_FORWARDING) && \

					 IPV4_DEVCONF((in_dev)->cnf, \

						      MC_FORWARDING))

#define IN_DEV_RPFILTER(in_dev)		IN_DEV_ANDCONF((in_dev), RP_FILTER)

#define IN_DEV_SOURCE_ROUTE(in_dev)	IN_DEV_ANDCONF((in_dev), \

						       ACCEPT_SOURCE_ROUTE)

#define IN_DEV_BOOTP_RELAY(in_dev)	IN_DEV_ANDCONF((in_dev), BOOTP_RELAY)



#define IN_DEV_LOG_MARTIANS(in_dev)	IN_DEV_ORCONF((in_dev), LOG_MARTIANS)

#define IN_DEV_PROXY_ARP(in_dev)	IN_DEV_ORCONF((in_dev), PROXY_ARP)

#define IN_DEV_SHARED_MEDIA(in_dev)	IN_DEV_ORCONF((in_dev), SHARED_MEDIA)

#define IN_DEV_TX_REDIRECTS(in_dev)	IN_DEV_ORCONF((in_dev), SEND_REDIRECTS)

#define IN_DEV_SEC_REDIRECTS(in_dev)	IN_DEV_ORCONF((in_dev), \

						      SECURE_REDIRECTS)

#define IN_DEV_IDTAG(in_dev)		IN_DEV_CONF_GET(in_dev, TAG)

#define IN_DEV_MEDIUM_ID(in_dev)	IN_DEV_CONF_GET(in_dev, MEDIUM_ID)

#define IN_DEV_PROMOTE_SECONDARIES(in_dev) \

					IN_DEV_ORCONF((in_dev), \

						      PROMOTE_SECONDARIES)



#define IN_DEV_RX_REDIRECTS(in_dev) \

	((IN_DEV_FORWARD(in_dev) && \

	  (ipv4_devconf.accept_redirects && (in_dev)->cnf.accept_redirects)) \

	  IN_DEV_ANDCONF((in_dev), ACCEPT_REDIRECTS)) \

	 || (!IN_DEV_FORWARD(in_dev) && \

	  (ipv4_devconf.accept_redirects || (in_dev)->cnf.accept_redirects)))

	  IN_DEV_ORCONF((in_dev), ACCEPT_REDIRECTS)))



#define IN_DEV_ARPFILTER(in_dev)	(ipv4_devconf.arp_filter || (in_dev)->cnf.arp_filter)

#define IN_DEV_ARP_ANNOUNCE(in_dev)	(max(ipv4_devconf.arp_announce, (in_dev)->cnf.arp_announce))

#define IN_DEV_ARP_IGNORE(in_dev)	(max(ipv4_devconf.arp_ignore, (in_dev)->cnf.arp_ignore))

#define IN_DEV_ARPFILTER(in_dev)	IN_DEV_ORCONF((in_dev), ARPFILTER)

#define IN_DEV_ARP_ANNOUNCE(in_dev)	IN_DEV_MAXCONF((in_dev), ARP_ANNOUNCE)

#define IN_DEV_ARP_IGNORE(in_dev)	IN_DEV_MAXCONF((in_dev), ARP_IGNORE)



struct in_ifaddr

{
@@ -108,7 +130,6 @@ extern struct net_device *ip_dev_find(__be32 addr); 
extern int		inet_addr_onlink(struct in_device *in_dev, __be32 a, __be32 b);

extern int		devinet_ioctl(unsigned int cmd, void __user *);

extern void		devinet_init(void);

extern struct in_device *inetdev_init(struct net_device *dev);

extern struct in_device	*inetdev_by_index(int);

extern __be32		inet_select_addr(const struct net_device *dev, __be32 dst, int scope);

extern __be32		inet_confirm_addr(const struct net_device *dev, __be32 dst, __be32 local, int scope);

include/linux/netfilter_ipv4/ip_tables.h

+20 −0
Original line number Diff line number Diff line
@@ -264,6 +264,26 @@ ipt_get_target(struct ipt_entry *e) 
	__ret;							\

})



/* fn returns 0 to continue iteration */

#define IPT_ENTRY_ITERATE_CONTINUE(entries, size, n, fn, args...) \

({								\

	unsigned int __i, __n;					\

	int __ret = 0;						\

	struct ipt_entry *__entry;				\

								\

	for (__i = 0, __n = 0; __i < (size);			\

	     __i += __entry->next_offset, __n++) { 		\

		__entry = (void *)(entries) + __i;		\

		if (__n < n)					\

			continue;				\

								\

		__ret = fn(__entry , ## args);			\

		if (__ret != 0)					\

			break;					\

	}							\

	__ret;							\

})



/*

 *	Main firewall chains definitions and global var's definitions.

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE