---

yaml
---
r: 315431
b: refs/heads/master
c: 80d0a69
h: refs/heads/master
i:
  315429: 8e3eec5
  315427: 03362ad
  315423: 9d54898
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd2d0837abc0206ecdd3f6b9fc8c25b55b63c96b
+refs/heads/master: 80d0a69fc57715dc9080c0567df1ed911b78abea

trunk/Documentation/networking/ip-sysctl.txt

@@ -565,11 +565,6 @@ tcp_limit_output_bytes - INTEGER
 	reduce the size of individual GSO packet (64KB being the max)
 	Default: 131072
 
-tcp_challenge_ack_limit - INTEGER
-	Limits number of Challenge ACK sent per second, as recommended
-	in RFC 5961 (Improving TCP's Robustness to Blind In-Window Attacks)
-	Default: 100
-
 UDP variables:
 
 udp_mem - vector of 3 INTEGERs: min, pressure, max

trunk/arch/blackfin/mach-bf537/boards/stamp.c

@@ -873,7 +873,7 @@ static struct adf702x_platform_data adf7021_platform_data = {
 };
 static inline void adf702x_mac_init(void)
 {
-	eth_random_addr(adf7021_platform_data.mac_addr);
+	random_ether_addr(adf7021_platform_data.mac_addr);
 }
 #else
 static inline void adf702x_mac_init(void) {}

trunk/arch/c6x/kernel/soc.c

@@ -80,7 +80,7 @@ int soc_mac_addr(unsigned int index, u8 *addr)
 		if (have_fuse_mac)
 			memcpy(addr, c6x_fuse_mac, 6);
 		else
-			eth_random_addr(addr);
+			random_ether_addr(addr);
 	}
 
 	/* adjust for specific EMAC device */

trunk/arch/mips/ar7/platform.c

@@ -310,10 +310,10 @@ static void __init cpmac_get_mac(int instance, unsigned char *dev_addr)
 					&dev_addr[4], &dev_addr[5]) != 6) {
 			pr_warning("cannot parse mac address, "
 					"using random address\n");
-			eth_random_addr(dev_addr);
+			random_ether_addr(dev_addr);
 		}
 	} else
-		eth_random_addr(dev_addr);
+		random_ether_addr(dev_addr);
 }
 
 /*****************************************************************************

trunk/arch/mips/powertv/powertv_setup.c

@@ -254,7 +254,7 @@ early_param("rfmac", rfmac_param);
  * Generates an Ethernet MAC address that is highly likely to be unique for
  * this particular system on a network with other systems of the same type.
  *
- * The problem we are solving is that, when eth_random_addr() is used to
+ * The problem we are solving is that, when random_ether_addr() is used to
  * generate MAC addresses at startup, there isn't much entropy for the random
  * number generator to use and the addresses it produces are fairly likely to
  * be the same as those of other identical systems on the same local network.
@@ -269,7 +269,7 @@ early_param("rfmac", rfmac_param);
  * Still, this does give us something to work with.
  *
  * The approach we take is:
- * 1.	If we can't get the RF MAC Address, just call eth_random_addr.
+ * 1.	If we can't get the RF MAC Address, just call random_ether_addr.
  * 2.	Use the 24-bit NIC-specific bits of the RF MAC address as the last 24
  *	bits of the new address. This is very likely to be unique, except for
  *	the current box.
@@ -299,7 +299,7 @@ void platform_random_ether_addr(u8 addr[ETH_ALEN])
 	if (!have_rfmac) {
 		pr_warning("rfmac not available on command line; "
 			"generating random MAC address\n");
-		eth_random_addr(addr);
+		random_ether_addr(addr);
 	}
 
 	else {

trunk/arch/um/drivers/net_kern.c

@@ -339,7 +339,7 @@ static int setup_etheraddr(char *str, unsigned char *addr, char *name)
 random:
 	printk(KERN_INFO
 	       "Choosing a random ethernet address for device %s\n", name);
-	eth_random_addr(addr);
+	random_ether_addr(addr);
 	return 1;
 }
 

trunk/drivers/connector/cn_proc.c

@@ -46,7 +46,7 @@ static DEFINE_PER_CPU(__u32, proc_event_counts) = { 0 };
 static inline void get_seq(__u32 *ts, int *cpu)
 {
 	preempt_disable();
-	*ts = __this_cpu_inc_return(proc_event_counts) - 1;
+	*ts = __this_cpu_inc_return(proc_event_counts) -1;
 	*cpu = smp_processor_id();
 	preempt_enable();
 }
@@ -62,8 +62,8 @@ void proc_fork_connector(struct task_struct *task)
 	if (atomic_read(&proc_event_num_listeners) < 1)
 		return;
 
-	msg = (struct cn_msg *)buffer;
-	ev = (struct proc_event *)msg->data;
+	msg = (struct cn_msg*)buffer;
+	ev = (struct proc_event*)msg->data;
 	get_seq(&msg->seq, &ev->cpu);
 	ktime_get_ts(&ts); /* get high res monotonic timestamp */
 	put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
@@ -93,8 +93,8 @@ void proc_exec_connector(struct task_struct *task)
 	if (atomic_read(&proc_event_num_listeners) < 1)
 		return;
 
-	msg = (struct cn_msg *)buffer;
-	ev = (struct proc_event *)msg->data;
+	msg = (struct cn_msg*)buffer;
+	ev = (struct proc_event*)msg->data;
 	get_seq(&msg->seq, &ev->cpu);
 	ktime_get_ts(&ts); /* get high res monotonic timestamp */
 	put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
@@ -119,8 +119,8 @@ void proc_id_connector(struct task_struct *task, int which_id)
 	if (atomic_read(&proc_event_num_listeners) < 1)
 		return;
 
-	msg = (struct cn_msg *)buffer;
-	ev = (struct proc_event *)msg->data;
+	msg = (struct cn_msg*)buffer;
+	ev = (struct proc_event*)msg->data;
 	ev->what = which_id;
 	ev->event_data.id.process_pid = task->pid;
 	ev->event_data.id.process_tgid = task->tgid;
@@ -134,7 +134,7 @@ void proc_id_connector(struct task_struct *task, int which_id)
 		ev->event_data.id.e.egid = cred->egid;
 	} else {
 		rcu_read_unlock();
-		return;
+	     	return;
 	}
 	rcu_read_unlock();
 	get_seq(&msg->seq, &ev->cpu);
@@ -241,8 +241,8 @@ void proc_exit_connector(struct task_struct *task)
 	if (atomic_read(&proc_event_num_listeners) < 1)
 		return;
 
-	msg = (struct cn_msg *)buffer;
-	ev = (struct proc_event *)msg->data;
+	msg = (struct cn_msg*)buffer;
+	ev = (struct proc_event*)msg->data;
 	get_seq(&msg->seq, &ev->cpu);
 	ktime_get_ts(&ts); /* get high res monotonic timestamp */
 	put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
@@ -276,8 +276,8 @@ static void cn_proc_ack(int err, int rcvd_seq, int rcvd_ack)
 	if (atomic_read(&proc_event_num_listeners) < 1)
 		return;
 
-	msg = (struct cn_msg *)buffer;
-	ev = (struct proc_event *)msg->data;
+	msg = (struct cn_msg*)buffer;
+	ev = (struct proc_event*)msg->data;
 	msg->seq = rcvd_seq;
 	ktime_get_ts(&ts); /* get high res monotonic timestamp */
 	put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
@@ -303,7 +303,7 @@ static void cn_proc_mcast_ctl(struct cn_msg *msg,
 	if (msg->len != sizeof(*mc_op))
 		return;
 
-	mc_op = (enum proc_cn_mcast_op *)msg->data;
+	mc_op = (enum proc_cn_mcast_op*)msg->data;
 	switch (*mc_op) {
 	case PROC_CN_MCAST_LISTEN:
 		atomic_inc(&proc_event_num_listeners);
@@ -325,11 +325,11 @@ static void cn_proc_mcast_ctl(struct cn_msg *msg,
  */
 static int __init cn_proc_init(void)
 {
-	int err = cn_add_callback(&cn_proc_event_id,
-				  "cn_proc",
-				  &cn_proc_mcast_ctl);
-	if (err) {
-		pr_warn("cn_proc failed to register\n");
+	int err;
+
+	if ((err = cn_add_callback(&cn_proc_event_id, "cn_proc",
+	 			   &cn_proc_mcast_ctl))) {
+		printk(KERN_WARNING "cn_proc failed to register\n");
 		return err;
 	}
 	return 0;

trunk/drivers/connector/cn_queue.c

@@ -1,5 +1,5 @@
 /*
- *	cn_queue.c
+ * 	cn_queue.c
  *
  * 2004+ Copyright (c) Evgeniy Polyakov <zbr@ioremap.net>
  * All rights reserved.
@@ -34,14 +34,13 @@
 static struct cn_callback_entry *
 cn_queue_alloc_callback_entry(struct cn_queue_dev *dev, const char *name,
 			      struct cb_id *id,
-			      void (*callback)(struct cn_msg *,
-					       struct netlink_skb_parms *))
+			      void (*callback)(struct cn_msg *, struct netlink_skb_parms *))
 {
 	struct cn_callback_entry *cbq;
 
 	cbq = kzalloc(sizeof(*cbq), GFP_KERNEL);
 	if (!cbq) {
-		pr_err("Failed to create new callback queue.\n");
+		printk(KERN_ERR "Failed to create new callback queue.\n");
 		return NULL;
 	}
 
@@ -72,8 +71,7 @@ int cn_cb_equal(struct cb_id *i1, struct cb_id *i2)
 
 int cn_queue_add_callback(struct cn_queue_dev *dev, const char *name,
 			  struct cb_id *id,
-			  void (*callback)(struct cn_msg *,
-					   struct netlink_skb_parms *))
+			  void (*callback)(struct cn_msg *, struct netlink_skb_parms *))
 {
 	struct cn_callback_entry *cbq, *__cbq;
 	int found = 0;
@@ -151,7 +149,7 @@ void cn_queue_free_dev(struct cn_queue_dev *dev)
 	spin_unlock_bh(&dev->queue_lock);
 
 	while (atomic_read(&dev->refcnt)) {
-		pr_info("Waiting for %s to become free: refcnt=%d.\n",
+		printk(KERN_INFO "Waiting for %s to become free: refcnt=%d.\n",
 		       dev->name, atomic_read(&dev->refcnt));
 		msleep(1000);
 	}

trunk/drivers/connector/connector.c

@@ -1,5 +1,5 @@
 /*
- *	connector.c
+ * 	connector.c
  *
  * 2004+ Copyright (c) Evgeniy Polyakov <zbr@ioremap.net>
  * All rights reserved.
@@ -185,8 +185,7 @@ static void cn_rx_skb(struct sk_buff *__skb)
  * May sleep.
  */
 int cn_add_callback(struct cb_id *id, const char *name,
-		    void (*callback)(struct cn_msg *,
-				     struct netlink_skb_parms *))
+		    void (*callback)(struct cn_msg *, struct netlink_skb_parms *))
 {
 	int err;
 	struct cn_dev *dev = &cdev;

trunk/drivers/isdn/gigaset/capi.c

@@ -288,7 +288,6 @@ static inline void dump_rawmsg(enum debuglevel level, const char *tag,
  * format CAPI IE as string
  */
 
-#ifdef CONFIG_GIGASET_DEBUG
 static const char *format_ie(const char *ie)
 {
 	static char result[3 * MAX_FMT_IE_LEN];
@@ -314,7 +313,6 @@ static const char *format_ie(const char *ie)
 	*--pout = 0;
 	return result;
 }
-#endif
 
 /*
  * emit DATA_B3_CONF message

trunk/drivers/net/bonding/bond_main.c

@@ -1240,7 +1240,9 @@ static inline int slave_enable_netpoll(struct slave *slave)
 	if (!np)
 		goto out;
 
-	err = __netpoll_setup(np, slave->dev);
+	np->dev = slave->dev;
+	strlcpy(np->dev_name, slave->dev->name, IFNAMSIZ);
+	err = __netpoll_setup(np);
 	if (err) {
 		kfree(np);
 		goto out;

trunk/drivers/net/can/flexcan.c

@@ -192,7 +192,7 @@ struct flexcan_priv {
 
 	struct clk *clk;
 	struct flexcan_platform_data *pdata;
-	const struct flexcan_devtype_data *devtype_data;
+	struct flexcan_devtype_data *devtype_data;
 };
 
 static struct flexcan_devtype_data fsl_p1010_devtype_data = {
@@ -960,7 +960,7 @@ static const struct platform_device_id flexcan_id_table[] = {
 static int __devinit flexcan_probe(struct platform_device *pdev)
 {
 	const struct of_device_id *of_id;
-	const struct flexcan_devtype_data *devtype_data;
+	struct flexcan_devtype_data *devtype_data;
 	struct net_device *dev;
 	struct flexcan_priv *priv;
 	struct resource *mem;

trunk/drivers/net/can/mscan/mpc5xxx_can.c

@@ -251,7 +251,7 @@ static struct of_device_id mpc5xxx_can_table[];
 static int __devinit mpc5xxx_can_probe(struct platform_device *ofdev)
 {
 	const struct of_device_id *match;
-	const struct mpc5xxx_can_data *data;
+	struct mpc5xxx_can_data *data;
 	struct device_node *np = ofdev->dev.of_node;
 	struct net_device *dev;
 	struct mscan_priv *priv;

trunk/drivers/net/can/softing/softing_main.c

@@ -826,12 +826,12 @@ static __devinit int softing_pdev_probe(struct platform_device *pdev)
 		goto sysfs_failed;
 	}
 
+	ret = -ENOMEM;
 	for (j = 0; j < ARRAY_SIZE(card->net); ++j) {
 		card->net[j] = netdev =
 			softing_netdev_create(card, card->id.chip[j]);
 		if (!netdev) {
 			dev_alert(&pdev->dev, "failed to make can[%i]", j);
-			ret = -ENOMEM;
 			goto netdev_failed;
 		}
 		priv = netdev_priv(card->net[j]);

trunk/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c

@@ -199,7 +199,7 @@ int atl1c_read_mac_addr(struct atl1c_hw *hw)
 
 	err = atl1c_get_permanent_address(hw);
 	if (err)
-		eth_random_addr(hw->perm_mac_addr);
+		random_ether_addr(hw->perm_mac_addr);
 
 	memcpy(hw->mac_addr, hw->perm_mac_addr, sizeof(hw->perm_mac_addr));
 	return err;

trunk/drivers/net/ethernet/atheros/atlx/atl1.c

@@ -538,7 +538,7 @@ static s32 atl1_read_mac_addr(struct atl1_hw *hw)
 	u16 i;
 
 	if (atl1_get_permanent_address(hw)) {
-		eth_random_addr(hw->perm_mac_addr);
+		random_ether_addr(hw->perm_mac_addr);
 		ret = 1;
 	}
 

trunk/drivers/net/ethernet/atheros/atlx/atl2.c

@@ -2346,7 +2346,7 @@ static s32 atl2_read_mac_addr(struct atl2_hw *hw)
 {
 	if (get_permanent_address(hw)) {
 		/* for test */
-		/* FIXME: shouldn't we use eth_random_addr() here? */
+		/* FIXME: shouldn't we use random_ether_addr() here? */
 		hw->perm_mac_addr[0] = 0x00;
 		hw->perm_mac_addr[1] = 0x13;
 		hw->perm_mac_addr[2] = 0x74;

trunk/drivers/net/ethernet/broadcom/bnx2.c

@@ -6388,7 +6388,6 @@ bnx2_reset_task(struct work_struct *work)
 {
 	struct bnx2 *bp = container_of(work, struct bnx2, reset_task);
 	int rc;
-	u16 pcicmd;
 
 	rtnl_lock();
 	if (!netif_running(bp->dev)) {
@@ -6398,12 +6397,6 @@ bnx2_reset_task(struct work_struct *work)
 
 	bnx2_netif_stop(bp, true);
 
-	pci_read_config_word(bp->pdev, PCI_COMMAND, &pcicmd);
-	if (!(pcicmd & PCI_COMMAND_MEMORY)) {
-		/* in case PCI block has reset */
-		pci_restore_state(bp->pdev);
-		pci_save_state(bp->pdev);
-	}
 	rc = bnx2_init_nic(bp, 1);
 	if (rc) {
 		netdev_err(bp->dev, "failed to reset NIC, closing\n");

trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h

@@ -614,22 +614,6 @@ struct bnx2x_fastpath {
 #define TX_BD(x)		((x) & MAX_TX_BD)
 #define TX_BD_POFF(x)		((x) & MAX_TX_DESC_CNT)
 
-/* number of NEXT_PAGE descriptors may be required during placement */
-#define NEXT_CNT_PER_TX_PKT(bds)	\
-				(((bds) + MAX_TX_DESC_CNT - 1) / \
-				 MAX_TX_DESC_CNT * NEXT_PAGE_TX_DESC_CNT)
-/* max BDs per tx packet w/o next_pages:
- * START_BD		- describes packed
- * START_BD(splitted)	- includes unpaged data segment for GSO
- * PARSING_BD		- for TSO and CSUM data
- * Frag BDs		- decribes pages for frags
- */
-#define BDS_PER_TX_PKT		3
-#define MAX_BDS_PER_TX_PKT	(MAX_SKB_FRAGS + BDS_PER_TX_PKT)
-/* max BDs per tx packet including next pages */
-#define MAX_DESC_PER_TX_PKT	(MAX_BDS_PER_TX_PKT + \
-				 NEXT_CNT_PER_TX_PKT(MAX_BDS_PER_TX_PKT))
-
 /* The RX BD ring is special, each bd is 8 bytes but the last one is 16 */
 #define NUM_RX_RINGS		8
 #define RX_DESC_CNT		(BCM_PAGE_SIZE / sizeof(struct eth_rx_bd))