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

Commit 605a494e 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:
  [IPv6]: Invalid semicolon after if statement
  [NET]: Fix unbalanced rcu_read_unlock in __sock_create
  [VLAN] net/8021q/vlanproc.c: fix check-after-use
  [NET]: Unexport dev_ethtool
  [IOAT]: Remove redundant struct member to avoid descriptor cache miss
  [ECONET]: remove econet_packet_type on unload
  [AX25]: don't free pointers to statically allocated data
  [PATCH] mac80211: probe for hidden SSIDs in pre-auth scan
  [PATCH] mac80211: fix tx status frame code
  [BRIDGE]: Fix typo in net/bridge/br_stp_if.c
  [BRIDGE]: sysfs locking fix.
  [NETFILTER]: nf_nat_sip: don't drop short packets
  [NETFILTER]: nf_conntrack_sip: fix SIP-URI parsing
  [NETFILTER]: nf_conntrack_sip: check sname != NULL before calling strncmp
  [NETFILTER]: netfilter: xt_u32 bug correction
parents 585eb6da 660adc6e

drivers/dma/ioatdma.c

+3 −4
Original line number Diff line number Diff line
@@ -347,8 +347,7 @@ ioat_dma_prep_memcpy(struct dma_chan *chan, size_t len, int int_en) 
	new->async_tx.ack = 0; /* client is in control of this ack */

	new->async_tx.cookie = -EBUSY;



	pci_unmap_len_set(new, src_len, orig_len);

	pci_unmap_len_set(new, dst_len, orig_len);

	pci_unmap_len_set(new, len, orig_len);

	spin_unlock_bh(&ioat_chan->desc_lock);



	return new ? &new->async_tx : NULL;
@@ -423,11 +422,11 @@ static void ioat_dma_memcpy_cleanup(struct ioat_dma_chan *chan) 
			*/

			pci_unmap_page(chan->device->pdev,

					pci_unmap_addr(desc, dst),

					pci_unmap_len(desc, dst_len),

					pci_unmap_len(desc, len),

					PCI_DMA_FROMDEVICE);

			pci_unmap_page(chan->device->pdev,

					pci_unmap_addr(desc, src),

					pci_unmap_len(desc, src_len),

					pci_unmap_len(desc, len),

					PCI_DMA_TODEVICE);

		}

drivers/dma/ioatdma.h

+1 −2
Original line number Diff line number Diff line
@@ -111,10 +111,9 @@ struct ioat_desc_sw { 
	struct ioat_dma_descriptor *hw;

	struct list_head node;

	int tx_cnt;

	DECLARE_PCI_UNMAP_LEN(len)

	DECLARE_PCI_UNMAP_ADDR(src)

	DECLARE_PCI_UNMAP_LEN(src_len)

	DECLARE_PCI_UNMAP_ADDR(dst)

	DECLARE_PCI_UNMAP_LEN(dst_len)

	struct dma_async_tx_descriptor async_tx;

};

net/8021q/vlanproc.c

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ static int vlandev_seq_show(struct seq_file *seq, void *offset) 
	static const char fmt[] = "%30s %12lu\n";

	int i;



	if ((vlandev == NULL) || (!(vlandev->priv_flags & IFF_802_1Q_VLAN)))

	if (!(vlandev->priv_flags & IFF_802_1Q_VLAN))

		return 0;



	seq_printf(seq, "%s  VID: %d	 REORDER_HDR: %i  dev->priv_flags: %hx\n",

net/ax25/ax25_iface.c

+0 −2
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ void ax25_protocol_release(unsigned int pid) 
	if (protocol->pid == pid) {

		protocol_list = protocol->next;

		write_unlock_bh(&protocol_list_lock);

		kfree(protocol);

		return;

	}
@@ -78,7 +77,6 @@ void ax25_protocol_release(unsigned int pid) 
			s = protocol->next;

			protocol->next = protocol->next->next;

			write_unlock_bh(&protocol_list_lock);

			kfree(s);

			return;

		}

net/bridge/br_stp_if.c

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static void br_stp_start(struct net_bridge *br) 
	} else {

		br->stp_enabled = BR_KERNEL_STP;

		printk(KERN_INFO "%s: starting userspace STP failed, "

				"staring kernel STP\n", br->dev->name);

				"starting kernel STP\n", br->dev->name);



		/* To start timers on any ports left in blocking */

		spin_lock_bh(&br->lock);