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

Commit ecefc36b 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: Add a flow_cache_flush_deferred function
  ipv4: reintroduce route cache garbage collector
  net: have ipconfig not wait if no dev is available
  sctp: Do not account for sizeof(struct sk_buff) in estimated rwnd
  asix: new device id
  davinci-cpdma: fix locking issue in cpdma_chan_stop
  sctp: fix incorrect overflow check on autoclose
  r8169: fix Config2 MSIEnable bit setting.
  llc: llc_cmsg_rcv was getting called after sk_eat_skb.
  net: bpf_jit: fix an off-one bug in x86_64 cond jump target
  iwlwifi: update SCD BC table for all SCD queues
  Revert "Bluetooth: Revert: Fix L2CAP connection establishment"
  Bluetooth: Clear RFCOMM session timer when disconnecting last channel
  Bluetooth: Prevent uninitialized data access in L2CAP configuration
  iwlwifi: allow to switch to HT40 if not associated
  iwlwifi: tx_sync only on PAN context
  mwifiex: avoid double list_del in command cancel path
  ath9k: fix max phy rate at rate control init
  nfc: signedness bug in __nci_request()
  iwlwifi: do not set the sequence control bit is not needed
parents d5ed5e48 c0ed1c14

arch/x86/net/bpf_jit_comp.c

+2 −2
Original line number Diff line number Diff line
@@ -568,8 +568,8 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i]; 
					break;

				}

				if (filter[i].jt != 0) {

					if (filter[i].jf)

						t_offset += is_near(f_offset) ? 2 : 6;

					if (filter[i].jf && f_offset)

						t_offset += is_near(f_offset) ? 2 : 5;

					EMIT_COND_JMP(t_op, t_offset);

					if (filter[i].jf)

						EMIT_JMP(f_offset);

drivers/net/ethernet/realtek/r8169.c

+8 −6
Original line number Diff line number Diff line
@@ -477,7 +477,6 @@ enum rtl_register_content { 
	/* Config1 register p.24 */

	LEDS1		= (1 << 7),

	LEDS0		= (1 << 6),

	MSIEnable	= (1 << 5),	/* Enable Message Signaled Interrupt */

	Speed_down	= (1 << 4),

	MEMMAP		= (1 << 3),

	IOMAP		= (1 << 2),
@@ -485,6 +484,7 @@ enum rtl_register_content { 
	PMEnable	= (1 << 0),	/* Power Management Enable */



	/* Config2 register p. 25 */

	MSIEnable	= (1 << 5),	/* 8169 only. Reserved in the 8168. */

	PCI_Clock_66MHz = 0x01,

	PCI_Clock_33MHz = 0x00,
@@ -3426,21 +3426,23 @@ static const struct rtl_cfg_info { 
};



/* Cfg9346_Unlock assumed. */

static unsigned rtl_try_msi(struct pci_dev *pdev, void __iomem *ioaddr,

static unsigned rtl_try_msi(struct rtl8169_private *tp,

			    const struct rtl_cfg_info *cfg)

{

	void __iomem *ioaddr = tp->mmio_addr;

	unsigned msi = 0;

	u8 cfg2;



	cfg2 = RTL_R8(Config2) & ~MSIEnable;

	if (cfg->features & RTL_FEATURE_MSI) {

		if (pci_enable_msi(pdev)) {

			dev_info(&pdev->dev, "no MSI. Back to INTx.\n");

		if (pci_enable_msi(tp->pci_dev)) {

			netif_info(tp, hw, tp->dev, "no MSI. Back to INTx.\n");

		} else {

			cfg2 |= MSIEnable;

			msi = RTL_FEATURE_MSI;

		}

	}

	if (tp->mac_version <= RTL_GIGA_MAC_VER_06)

		RTL_W8(Config2, cfg2);

	return msi;

}
@@ -4077,7 +4079,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
		tp->features |= RTL_FEATURE_WOL;

	if ((RTL_R8(Config5) & (UWF | BWF | MWF)) != 0)

		tp->features |= RTL_FEATURE_WOL;

	tp->features |= rtl_try_msi(pdev, ioaddr, cfg);

	tp->features |= rtl_try_msi(tp, cfg);

	RTL_W8(Cfg9346, Cfg9346_Lock);



	if (rtl_tbi_enabled(tp)) {

drivers/net/ethernet/ti/davinci_cpdma.c

+2 −0
Original line number Diff line number Diff line
@@ -836,11 +836,13 @@ int cpdma_chan_stop(struct cpdma_chan *chan) 
	chan_write(chan, cp, CPDMA_TEARDOWN_VALUE);



	/* handle completed packets */

	spin_unlock_irqrestore(&chan->lock, flags);

	do {

		ret = __cpdma_chan_process(chan);

		if (ret < 0)

			break;

	} while ((ret & CPDMA_DESC_TD_COMPLETE) == 0);

	spin_lock_irqsave(&chan->lock, flags);



	/* remaining packets haven't been tx/rx'ed, clean them up */

	while (chan->head) {

drivers/net/usb/asix.c

+4 −0
Original line number Diff line number Diff line
@@ -1655,6 +1655,10 @@ static const struct usb_device_id products [] = { 
	// ASIX 88772a

	USB_DEVICE(0x0db0, 0xa877),

	.driver_info = (unsigned long) &ax88772_info,

}, {

	// Asus USB Ethernet Adapter

	USB_DEVICE (0x0b95, 0x7e2b),

	.driver_info = (unsigned long) &ax88772_info,

},

	{ },		// END

};

drivers/net/wireless/ath/ath9k/rc.c

+3 −1
Original line number Diff line number Diff line
@@ -1271,7 +1271,9 @@ static void ath_rc_init(struct ath_softc *sc, 


	ath_rc_priv->max_valid_rate = k;

	ath_rc_sort_validrates(rate_table, ath_rc_priv);

	ath_rc_priv->rate_max_phy = ath_rc_priv->valid_rate_index[k-4];

	ath_rc_priv->rate_max_phy = (k > 4) ?

					ath_rc_priv->valid_rate_index[k-4] :

					ath_rc_priv->valid_rate_index[k-1];

	ath_rc_priv->rate_table = rate_table;



	ath_dbg(common, ATH_DBG_CONFIG,