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

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  netns: fix ip_rt_frag_needed rt_is_expired
  netfilter: nf_conntrack_extend: avoid unnecessary "ct->ext" dereferences
  netfilter: fix double-free and use-after free
  netfilter: arptables in netns for real
  netfilter: ip{,6}tables_security: fix future section mismatch
  selinux: use nf_register_hooks()
  netfilter: ebtables: use nf_register_hooks()
  Revert "pkt_sched: sch_sfq: dump a real number of flows"
  qeth: use dev->ml_priv instead of dev->priv
  syncookies: Make sure ECN is disabled
  net: drop unused BUG_TRAP()
  net: convert BUG_TRAP to generic WARN_ON
  drivers/net: convert BUG_TRAP to generic WARN_ON
parents 78681ac0 6c3b8fc6

drivers/net/bnx2x_main.c

+5 −5
Original line number Diff line number Diff line
@@ -814,7 +814,7 @@ static u16 bnx2x_free_tx_pkt(struct bnx2x *bp, struct bnx2x_fastpath *fp, 
	}



	/* release skb */

	BUG_TRAP(skb);

	WARN_ON(!skb);

	dev_kfree_skb(skb);

	tx_buf->first_bd = 0;

	tx_buf->skb = NULL;
@@ -837,9 +837,9 @@ static inline u16 bnx2x_tx_avail(struct bnx2x_fastpath *fp) 
	used = SUB_S16(prod, cons) + (s16)NUM_TX_RINGS;



#ifdef BNX2X_STOP_ON_ERROR

	BUG_TRAP(used >= 0);

	BUG_TRAP(used <= fp->bp->tx_ring_size);

	BUG_TRAP((fp->bp->tx_ring_size - used) <= MAX_TX_AVAIL);

	WARN_ON(used < 0);

	WARN_ON(used > fp->bp->tx_ring_size);

	WARN_ON((fp->bp->tx_ring_size - used) > MAX_TX_AVAIL);

#endif



	return (s16)(fp->bp->tx_ring_size) - used;
@@ -4374,7 +4374,7 @@ static void bnx2x_init_rx_rings(struct bnx2x *bp) 
			}

			ring_prod = NEXT_RX_IDX(ring_prod);

			cqe_ring_prod = NEXT_RCQ_IDX(cqe_ring_prod);

			BUG_TRAP(ring_prod > i);

			WARN_ON(ring_prod <= i);

		}



		fp->rx_bd_prod = ring_prod;

drivers/s390/net/qeth_core_main.c

+7 −7
Original line number Diff line number Diff line
@@ -3321,7 +3321,7 @@ int qeth_change_mtu(struct net_device *dev, int new_mtu) 
	struct qeth_card *card;

	char dbf_text[15];



	card = netdev_priv(dev);

	card = dev->ml_priv;



	QETH_DBF_TEXT(TRACE, 4, "chgmtu");

	sprintf(dbf_text, "%8x", new_mtu);
@@ -3343,7 +3343,7 @@ struct net_device_stats *qeth_get_stats(struct net_device *dev) 
{

	struct qeth_card *card;



	card = netdev_priv(dev);

	card = dev->ml_priv;



	QETH_DBF_TEXT(TRACE, 5, "getstat");
@@ -3395,7 +3395,7 @@ void qeth_tx_timeout(struct net_device *dev) 
{

	struct qeth_card *card;



	card = netdev_priv(dev);

	card = dev->ml_priv;

	card->stats.tx_errors++;

	qeth_schedule_recovery(card);

}
@@ -3403,7 +3403,7 @@ EXPORT_SYMBOL_GPL(qeth_tx_timeout); 


int qeth_mdio_read(struct net_device *dev, int phy_id, int regnum)

{

	struct qeth_card *card = netdev_priv(dev);

	struct qeth_card *card = dev->ml_priv;

	int rc = 0;



	switch (regnum) {
@@ -4253,7 +4253,7 @@ EXPORT_SYMBOL_GPL(qeth_core_get_stats_count); 
void qeth_core_get_ethtool_stats(struct net_device *dev,

		struct ethtool_stats *stats, u64 *data)

{

	struct qeth_card *card = netdev_priv(dev);

	struct qeth_card *card = dev->ml_priv;

	data[0] = card->stats.rx_packets -

				card->perf_stats.initial_rx_packets;

	data[1] = card->perf_stats.bufs_rec;
@@ -4313,7 +4313,7 @@ EXPORT_SYMBOL_GPL(qeth_core_get_strings); 
void qeth_core_get_drvinfo(struct net_device *dev,

		struct ethtool_drvinfo *info)

{

	struct qeth_card *card = netdev_priv(dev);

	struct qeth_card *card = dev->ml_priv;

	if (card->options.layer2)

		strcpy(info->driver, "qeth_l2");

	else
@@ -4331,7 +4331,7 @@ EXPORT_SYMBOL_GPL(qeth_core_get_drvinfo); 
int qeth_core_ethtool_get_settings(struct net_device *netdev,

					struct ethtool_cmd *ecmd)

{

	struct qeth_card *card = netdev_priv(netdev);

	struct qeth_card *card = netdev->ml_priv;

	enum qeth_link_types link_type;



	if ((card->info.type == QETH_CARD_TYPE_IQD) || (card->info.guestlan))

drivers/s390/net/qeth_l2_main.c

+13 −13
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static int qeth_l2_recover(void *); 


static int qeth_l2_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)

{

	struct qeth_card *card = netdev_priv(dev);

	struct qeth_card *card = dev->ml_priv;

	struct mii_ioctl_data *mii_data;

	int rc = 0;
@@ -317,7 +317,7 @@ static void qeth_l2_process_vlans(struct qeth_card *card, int clear) 


static void qeth_l2_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)

{

	struct qeth_card *card = netdev_priv(dev);

	struct qeth_card *card = dev->ml_priv;

	struct qeth_vlan_vid *id;



	QETH_DBF_TEXT_(TRACE, 4, "aid:%d", vid);
@@ -334,7 +334,7 @@ static void qeth_l2_vlan_rx_add_vid(struct net_device *dev, unsigned short vid) 
static void qeth_l2_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)

{

	struct qeth_vlan_vid *id, *tmpid = NULL;

	struct qeth_card *card = netdev_priv(dev);

	struct qeth_card *card = dev->ml_priv;



	QETH_DBF_TEXT_(TRACE, 4, "kid:%d", vid);

	spin_lock_bh(&card->vlanlock);
@@ -566,7 +566,7 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card) 
static int qeth_l2_set_mac_address(struct net_device *dev, void *p)

{

	struct sockaddr *addr = p;

	struct qeth_card *card = netdev_priv(dev);

	struct qeth_card *card = dev->ml_priv;

	int rc = 0;



	QETH_DBF_TEXT(TRACE, 3, "setmac");
@@ -590,7 +590,7 @@ static int qeth_l2_set_mac_address(struct net_device *dev, void *p) 


static void qeth_l2_set_multicast_list(struct net_device *dev)

{

	struct qeth_card *card = netdev_priv(dev);

	struct qeth_card *card = dev->ml_priv;

	struct dev_mc_list *dm;



	if (card->info.type == QETH_CARD_TYPE_OSN)
@@ -612,7 +612,7 @@ static int qeth_l2_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	int rc;

	struct qeth_hdr *hdr = NULL;

	int elements = 0;

	struct qeth_card *card = netdev_priv(dev);

	struct qeth_card *card = dev->ml_priv;

	struct sk_buff *new_skb = skb;

	int ipv = qeth_get_ip_version(skb);

	int cast_type = qeth_get_cast_type(card, skb);
@@ -767,7 +767,7 @@ static void qeth_l2_qdio_input_handler(struct ccw_device *ccwdev, 


static int qeth_l2_open(struct net_device *dev)

{

	struct qeth_card *card = netdev_priv(dev);

	struct qeth_card *card = dev->ml_priv;



	QETH_DBF_TEXT(TRACE, 4, "qethopen");

	if (card->state != CARD_STATE_SOFTSETUP)
@@ -791,7 +791,7 @@ static int qeth_l2_open(struct net_device *dev) 


static int qeth_l2_stop(struct net_device *dev)

{

	struct qeth_card *card = netdev_priv(dev);

	struct qeth_card *card = dev->ml_priv;



	QETH_DBF_TEXT(TRACE, 4, "qethstop");

	netif_tx_disable(dev);
@@ -838,7 +838,7 @@ static void qeth_l2_remove_device(struct ccwgroup_device *cgdev) 


static int qeth_l2_ethtool_set_tso(struct net_device *dev, u32 data)

{

	struct qeth_card *card = netdev_priv(dev);

	struct qeth_card *card = dev->ml_priv;



	if (data) {

		if (card->options.large_send == QETH_LARGE_SEND_NO) {
@@ -894,7 +894,7 @@ static int qeth_l2_setup_netdev(struct qeth_card *card) 
	if (!card->dev)

		return -ENODEV;



	card->dev->priv = card;

	card->dev->ml_priv = card;

	card->dev->tx_timeout = &qeth_tx_timeout;

	card->dev->watchdog_timeo = QETH_TX_TIMEOUT;

	card->dev->open = qeth_l2_open;
@@ -1178,7 +1178,7 @@ int qeth_osn_assist(struct net_device *dev, void *data, int data_len) 
	QETH_DBF_TEXT(TRACE, 2, "osnsdmc");

	if (!dev)

		return -ENODEV;

	card = netdev_priv(dev);

	card = dev->ml_priv;

	if (!card)

		return -ENODEV;

	if ((card->state != CARD_STATE_UP) &&
@@ -1201,7 +1201,7 @@ int qeth_osn_register(unsigned char *read_dev_no, struct net_device **dev, 
	*dev = qeth_l2_netdev_by_devno(read_dev_no);

	if (*dev == NULL)

		return -ENODEV;

	card = netdev_priv(*dev);

	card = (*dev)->ml_priv;

	if (!card)

		return -ENODEV;

	if ((assist_cb == NULL) || (data_cb == NULL))
@@ -1219,7 +1219,7 @@ void qeth_osn_deregister(struct net_device *dev) 
	QETH_DBF_TEXT(TRACE, 2, "osndereg");

	if (!dev)

		return;

	card = netdev_priv(dev);

	card = dev->ml_priv;

	if (!card)

		return;

	card->osn_info.assist_cb = NULL;

drivers/s390/net/qeth_l3_main.c

+15 −15
Original line number Diff line number Diff line
@@ -1813,7 +1813,7 @@ static void qeth_l3_free_vlan_addresses(struct qeth_card *card, 
static void qeth_l3_vlan_rx_register(struct net_device *dev,

			struct vlan_group *grp)

{

	struct qeth_card *card = netdev_priv(dev);

	struct qeth_card *card = dev->ml_priv;

	unsigned long flags;



	QETH_DBF_TEXT(TRACE, 4, "vlanreg");
@@ -1825,7 +1825,7 @@ static void qeth_l3_vlan_rx_register(struct net_device *dev, 
static void qeth_l3_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)

{

	struct net_device *vlandev;

	struct qeth_card *card = (struct qeth_card *) dev->priv;

	struct qeth_card *card = dev->ml_priv;

	struct in_device *in_dev;



	if (card->info.type == QETH_CARD_TYPE_IQD)
@@ -1851,7 +1851,7 @@ static void qeth_l3_vlan_rx_add_vid(struct net_device *dev, unsigned short vid) 


static void qeth_l3_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)

{

	struct qeth_card *card = netdev_priv(dev);

	struct qeth_card *card = dev->ml_priv;

	unsigned long flags;



	QETH_DBF_TEXT_(TRACE, 4, "kid:%d", vid);
@@ -2013,7 +2013,7 @@ static int qeth_l3_verify_vlan_dev(struct net_device *dev, 
		}

	}



	if (rc && !(netdev_priv(vlan_dev_real_dev(dev)) == (void *)card))

	if (rc && !(vlan_dev_real_dev(dev)->ml_priv == (void *)card))

		return 0;



	return rc;
@@ -2047,9 +2047,9 @@ static struct qeth_card *qeth_l3_get_card_from_dev(struct net_device *dev) 


	rc = qeth_l3_verify_dev(dev);

	if (rc == QETH_REAL_CARD)

		card = netdev_priv(dev);

		card = dev->ml_priv;

	else if (rc == QETH_VLAN_CARD)

		card = netdev_priv(vlan_dev_real_dev(dev));

		card = vlan_dev_real_dev(dev)->ml_priv;

	if (card && card->options.layer2)

		card = NULL;

	QETH_DBF_TEXT_(TRACE, 4, "%d", rc);
@@ -2110,7 +2110,7 @@ static int qeth_l3_stop_card(struct qeth_card *card, int recovery_mode) 


static void qeth_l3_set_multicast_list(struct net_device *dev)

{

	struct qeth_card *card = netdev_priv(dev);

	struct qeth_card *card = dev->ml_priv;



	QETH_DBF_TEXT(TRACE, 3, "setmulti");

	qeth_l3_delete_mc_addresses(card);
@@ -2438,7 +2438,7 @@ static int qeth_l3_arp_flush_cache(struct qeth_card *card) 


static int qeth_l3_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)

{

	struct qeth_card *card = netdev_priv(dev);

	struct qeth_card *card = dev->ml_priv;

	struct qeth_arp_cache_entry arp_entry;

	struct mii_ioctl_data *mii_data;

	int rc = 0;
@@ -2595,7 +2595,7 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	u16 *tag;

	struct qeth_hdr *hdr = NULL;

	int elements_needed = 0;

	struct qeth_card *card = netdev_priv(dev);

	struct qeth_card *card = dev->ml_priv;

	struct sk_buff *new_skb = NULL;

	int ipv = qeth_get_ip_version(skb);

	int cast_type = qeth_get_cast_type(card, skb);
@@ -2763,7 +2763,7 @@ tx_drop: 


static int qeth_l3_open(struct net_device *dev)

{

	struct qeth_card *card = netdev_priv(dev);

	struct qeth_card *card = dev->ml_priv;



	QETH_DBF_TEXT(TRACE, 4, "qethopen");

	if (card->state != CARD_STATE_SOFTSETUP)
@@ -2780,7 +2780,7 @@ static int qeth_l3_open(struct net_device *dev) 


static int qeth_l3_stop(struct net_device *dev)

{

	struct qeth_card *card = netdev_priv(dev);

	struct qeth_card *card = dev->ml_priv;



	QETH_DBF_TEXT(TRACE, 4, "qethstop");

	netif_tx_disable(dev);
@@ -2792,14 +2792,14 @@ static int qeth_l3_stop(struct net_device *dev) 


static u32 qeth_l3_ethtool_get_rx_csum(struct net_device *dev)

{

	struct qeth_card *card = netdev_priv(dev);

	struct qeth_card *card = dev->ml_priv;



	return (card->options.checksum_type == HW_CHECKSUMMING);

}



static int qeth_l3_ethtool_set_rx_csum(struct net_device *dev, u32 data)

{

	struct qeth_card *card = netdev_priv(dev);

	struct qeth_card *card = dev->ml_priv;

	enum qeth_card_states old_state;

	enum qeth_checksum_types csum_type;
@@ -2825,7 +2825,7 @@ static int qeth_l3_ethtool_set_rx_csum(struct net_device *dev, u32 data) 


static int qeth_l3_ethtool_set_tso(struct net_device *dev, u32 data)

{

	struct qeth_card *card = netdev_priv(dev);

	struct qeth_card *card = dev->ml_priv;



	if (data) {

		if (card->options.large_send == QETH_LARGE_SEND_NO) {
@@ -2915,7 +2915,7 @@ static int qeth_l3_setup_netdev(struct qeth_card *card) 
		return -ENODEV;



	card->dev->hard_start_xmit = qeth_l3_hard_start_xmit;

	card->dev->priv = card;

	card->dev->ml_priv = card;

	card->dev->tx_timeout = &qeth_tx_timeout;

	card->dev->watchdog_timeo = QETH_TX_TIMEOUT;

	card->dev->open = qeth_l3_open;

include/linux/rtnetlink.h

+0 −7
Original line number Diff line number Diff line
@@ -755,13 +755,6 @@ extern void __rtnl_unlock(void); 
	} \

} while(0)



#define BUG_TRAP(x) do { \

	if (unlikely(!(x))) { \

		printk(KERN_ERR "KERNEL: assertion (%s) failed at %s (%d)\n", \

			#x,  __FILE__ , __LINE__); \

	} \

} while(0)



static inline u32 rtm_get_table(struct rtattr **rta, u8 table)

{

	return RTA_GET_U32(rta[RTA_TABLE-1]);

CRA Git | Maintained and supported by SUSTech CRA and CCSE