Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  net: Silence seq_scale() unused warning
  ipv4:correct description for tcp_max_syn_backlog
  pasemi_mac: Fix building as module
  netback: Fix alert message.
  r8169: fix Rx index race between FIFO overflow recovery and NAPI handler.
  r8169: Rx FIFO overflow fixes.
  ipv4: Fix peer validation on cached lookup.
  ipv4: make sure RTO_ONLINK is saved in routing cache
  iwlwifi: change the default behavior of watchdog timer
  iwlwifi: do not re-configure HT40 after associated
  iwlagn: fix HW crypto for TX-only keys
  Revert "mac80211: clear sta.drv_priv on reconfiguration"
  mac80211: fill rate filter for internal scan requests
  cfg80211: amend regulatory NULL dereference fix
  cfg80211: fix race on init and driver registration
parents 091c0f86 68109090

Documentation/networking/ip-sysctl.txt

+5 −5
Original line number Diff line number Diff line
@@ -282,11 +282,11 @@ tcp_max_ssthresh - INTEGER 
	Default: 0 (off)



tcp_max_syn_backlog - INTEGER

	Maximal number of remembered connection requests, which are

	still did not receive an acknowledgment from connecting client.

	Default value is 1024 for systems with more than 128Mb of memory,

	and 128 for low memory machines. If server suffers of overload,

	try to increase this number.

	Maximal number of remembered connection requests, which have not

	received an acknowledgment from connecting client.

	The minimal value is 128 for low memory machines, and it will

	increase in proportion to the memory of machine.

	If server suffers from overload, try increasing this number.



tcp_max_tw_buckets - INTEGER

	Maximal number of timewait sockets held by system simultaneously.

drivers/net/ethernet/pasemi/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -2,4 +2,5 @@ 
# Makefile for the A Semi network device drivers.

#



obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o pasemi_mac_ethtool.o
 
obj-$(CONFIG_PASEMI_MAC) += pasemi_mac_driver.o

pasemi_mac_driver-objs := pasemi_mac.o pasemi_mac_ethtool.o

drivers/net/ethernet/realtek/r8169.c

+20 −33
Original line number Diff line number Diff line
@@ -1183,11 +1183,13 @@ static u8 rtl8168d_efuse_read(void __iomem *ioaddr, int reg_addr) 
	return value;

}



static void rtl8169_irq_mask_and_ack(void __iomem *ioaddr)

static void rtl8169_irq_mask_and_ack(struct rtl8169_private *tp)

{

	RTL_W16(IntrMask, 0x0000);

	void __iomem *ioaddr = tp->mmio_addr;



	RTL_W16(IntrStatus, 0xffff);

	RTL_W16(IntrMask, 0x0000);

	RTL_W16(IntrStatus, tp->intr_event);

	RTL_R8(ChipCmd);

}



static unsigned int rtl8169_tbi_reset_pending(struct rtl8169_private *tp)
@@ -3933,8 +3935,6 @@ static void rtl_hw_reset(struct rtl8169_private *tp) 
			break;

		udelay(100);

	}



	rtl8169_init_ring_indexes(tp);

}



static int __devinit
@@ -4339,7 +4339,7 @@ static void rtl8169_hw_reset(struct rtl8169_private *tp) 
	void __iomem *ioaddr = tp->mmio_addr;



	/* Disable interrupts */

	rtl8169_irq_mask_and_ack(ioaddr);

	rtl8169_irq_mask_and_ack(tp);



	rtl_rx_close(tp);
@@ -4885,8 +4885,7 @@ static void rtl_hw_start_8168(struct net_device *dev) 
	RTL_W16(IntrMitigate, 0x5151);



	/* Work around for RxFIFO overflow. */

	if (tp->mac_version == RTL_GIGA_MAC_VER_11 ||

	    tp->mac_version == RTL_GIGA_MAC_VER_22) {

	if (tp->mac_version == RTL_GIGA_MAC_VER_11) {

		tp->intr_event |= RxFIFOOver | PCSTimeout;

		tp->intr_event &= ~RxOverflow;

	}
@@ -5076,6 +5075,11 @@ static void rtl_hw_start_8101(struct net_device *dev) 
	void __iomem *ioaddr = tp->mmio_addr;

	struct pci_dev *pdev = tp->pci_dev;



	if (tp->mac_version >= RTL_GIGA_MAC_VER_30) {

		tp->intr_event &= ~RxFIFOOver;

		tp->napi_event &= ~RxFIFOOver;

	}



	if (tp->mac_version == RTL_GIGA_MAC_VER_13 ||

	    tp->mac_version == RTL_GIGA_MAC_VER_16) {

		int cap = pci_pcie_cap(pdev);
@@ -5342,7 +5346,7 @@ static void rtl8169_wait_for_quiescence(struct net_device *dev) 
	/* Wait for any pending NAPI task to complete */

	napi_disable(&tp->napi);



	rtl8169_irq_mask_and_ack(ioaddr);

	rtl8169_irq_mask_and_ack(tp);



	tp->intr_mask = 0xffff;

	RTL_W16(IntrMask, tp->intr_event);
@@ -5389,14 +5393,16 @@ static void rtl8169_reset_task(struct work_struct *work) 
	if (!netif_running(dev))

		goto out_unlock;



	rtl8169_hw_reset(tp);



	rtl8169_wait_for_quiescence(dev);



	for (i = 0; i < NUM_RX_DESC; i++)

		rtl8169_mark_to_asic(tp->RxDescArray + i, rx_buf_sz);



	rtl8169_tx_clear(tp);

	rtl8169_init_ring_indexes(tp);



	rtl8169_hw_reset(tp);

	rtl_hw_start(dev);

	netif_wake_queue(dev);

	rtl8169_check_link_status(dev, tp, tp->mmio_addr);
@@ -5407,11 +5413,6 @@ out_unlock: 


static void rtl8169_tx_timeout(struct net_device *dev)

{

	struct rtl8169_private *tp = netdev_priv(dev);



	rtl8169_hw_reset(tp);



	/* Let's wait a bit while any (async) irq lands on */

	rtl8169_schedule_work(dev, rtl8169_reset_task);

}
@@ -5804,6 +5805,10 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance) 
	 */

	status = RTL_R16(IntrStatus);

	while (status && status != 0xffff) {

		status &= tp->intr_event;

		if (!status)

			break;



		handled = 1;



		/* Handle all of the error cases first. These will reset
@@ -5818,27 +5823,9 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance) 
			switch (tp->mac_version) {

			/* Work around for rx fifo overflow */

			case RTL_GIGA_MAC_VER_11:

			case RTL_GIGA_MAC_VER_22:

			case RTL_GIGA_MAC_VER_26:

				netif_stop_queue(dev);

				rtl8169_tx_timeout(dev);

				goto done;

			/* Testers needed. */

			case RTL_GIGA_MAC_VER_17:

			case RTL_GIGA_MAC_VER_19:

			case RTL_GIGA_MAC_VER_20:

			case RTL_GIGA_MAC_VER_21:

			case RTL_GIGA_MAC_VER_23:

			case RTL_GIGA_MAC_VER_24:

			case RTL_GIGA_MAC_VER_27:

			case RTL_GIGA_MAC_VER_28:

			case RTL_GIGA_MAC_VER_31:

			/* Experimental science. Pktgen proof. */

			case RTL_GIGA_MAC_VER_12:

			case RTL_GIGA_MAC_VER_25:

				if (status == RxFIFOOver)

					goto done;

				break;

			default:

				break;

			}

drivers/net/wireless/iwlwifi/iwl-1000.c

+1 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ static struct iwl_base_params iwl1000_base_params = { 
	.chain_noise_scale = 1000,

	.wd_timeout = IWL_DEF_WD_TIMEOUT,

	.max_event_log_size = 128,

	.wd_disable = true,

};

static struct iwl_ht_params iwl1000_ht_params = {

	.ht_greenfield_support = true,

drivers/net/wireless/iwlwifi/iwl-5000.c

+1 −0
Original line number Diff line number Diff line
@@ -364,6 +364,7 @@ static struct iwl_base_params iwl5000_base_params = { 
	.wd_timeout = IWL_LONG_WD_TIMEOUT,

	.max_event_log_size = 512,

	.no_idle_support = true,

	.wd_disable = true,

};

static struct iwl_ht_params iwl5000_ht_params = {

	.ht_greenfield_support = true,