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

Commit 6f3776c9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (23 commits)
  [SCTP]: Fix compiler warning.
  [IP] TUNNEL: Fix to be built with user application.
  [IPV6]: Fixed the size of the netlink message notified by inet6_rt_notify().
  [TCP]: rare bad TCP checksum with 2.6.19
  [NET]: Process include/linux/if_{addr,link}.h with unifdef
  [NETFILTER]: Fix iptables ABI breakage on (at least) CRIS
  [IRDA] vlsi_ir.{h,c}: remove kernel 2.4 code
  [TCP]: skb is unexpectedly freed.
  [IPSEC]: Policy list disorder
  [IrDA]: Removed incorrect IRDA_ASSERT()
  [IrDA]: irda-usb TX path optimization (was Re: IrDA spams logfiles - since 2.6.19)
  [X.25]: Add missing sock_put in x25_receive_data
  [SCTP]: Fix SACK sequence during shutdown
  [SCTP]: Correctly handle unexpected INIT-ACK chunk.
  [SCTP]: Verify some mandatory parameters.
  [SCTP]: Set correct error cause value for missing parameters
  [NETFILTER]: fix xt_state compile failure
  [NETFILTER]: ctnetlink: fix leak in ctnetlink_create_conntrack error path
  [SELINUX]: increment flow cache genid
  [IPV6] MCAST: Fix joining all-node multicast group on device initialization.
  ...
parents 6e35c24b 1e5c11fc

drivers/net/irda/irda-usb.c

+20 −25
Original line number Diff line number Diff line
@@ -441,25 +441,13 @@ static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *netdev) 
		goto drop;

	}



	/* Make sure there is room for IrDA-USB header. The actual

	 * allocation will be done lower in skb_push().

	 * Also, we don't use directly skb_cow(), because it require

	 * headroom >= 16, which force unnecessary copies - Jean II */

	if (skb_headroom(skb) < self->header_length) {

		IRDA_DEBUG(0, "%s(), Insuficient skb headroom.\n", __FUNCTION__);

		if (skb_cow(skb, self->header_length)) {

			IRDA_WARNING("%s(), failed skb_cow() !!!\n", __FUNCTION__);

			goto drop;

		}

	}

	memcpy(self->tx_buff + self->header_length, skb->data, skb->len);



	/* Change setting for next frame */



	if (self->capability & IUC_STIR421X) {

		__u8 turnaround_time;

		__u8* frame;

		__u8* frame = self->tx_buff;

		turnaround_time = get_turnaround_time( skb );

		frame= skb_push(skb, self->header_length);

		irda_usb_build_header(self, frame, 0);

		frame[2] = turnaround_time;

		if ((skb->len != 0) &&
@@ -472,7 +460,7 @@ static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *netdev) 
			frame[1] = 0;

		}

	} else {

		irda_usb_build_header(self, skb_push(skb, self->header_length), 0);

		irda_usb_build_header(self, self->tx_buff, 0);

	}



	/* FIXME: Make macro out of this one */
@@ -480,9 +468,9 @@ static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *netdev) 


	usb_fill_bulk_urb(urb, self->usbdev,

		      usb_sndbulkpipe(self->usbdev, self->bulk_out_ep),

                      skb->data, IRDA_SKB_MAX_MTU,

                      self->tx_buff, skb->len + self->header_length,

                      write_bulk_callback, skb);

	urb->transfer_buffer_length = skb->len;



	/* This flag (URB_ZERO_PACKET) indicates that what we send is not

	 * a continuous stream of data but separate packets.

	 * In this case, the USB layer will insert an empty USB frame (TD)
@@ -1455,6 +1443,9 @@ static inline void irda_usb_close(struct irda_usb_cb *self) 
	/* Remove the speed buffer */

	kfree(self->speed_buff);

	self->speed_buff = NULL;



	kfree(self->tx_buff);

	self->tx_buff = NULL;

}



/********************** USB CONFIG SUBROUTINES **********************/
@@ -1524,8 +1515,6 @@ static inline int irda_usb_parse_endpoints(struct irda_usb_cb *self, struct usb_ 


	IRDA_DEBUG(0, "%s(), And our endpoints are : in=%02X, out=%02X (%d), int=%02X\n",

		__FUNCTION__, self->bulk_in_ep, self->bulk_out_ep, self->bulk_out_mtu, self->bulk_int_ep);

	/* Should be 8, 16, 32 or 64 bytes */

	IRDA_ASSERT(self->bulk_out_mtu == 64, ;);



	return((self->bulk_in_ep != 0) && (self->bulk_out_ep != 0));

}
@@ -1753,9 +1742,14 @@ static int irda_usb_probe(struct usb_interface *intf, 


	memset(self->speed_buff, 0, IRDA_USB_SPEED_MTU);



	self->tx_buff = kzalloc(IRDA_SKB_MAX_MTU + self->header_length,

				GFP_KERNEL);

	if (self->tx_buff == NULL)

		goto err_out_4;



	ret = irda_usb_open(self);

	if (ret) 

		goto err_out_4;

		goto err_out_5;



	IRDA_MESSAGE("IrDA: Registered device %s\n", net->name);

	usb_set_intfdata(intf, self);
@@ -1766,14 +1760,14 @@ static int irda_usb_probe(struct usb_interface *intf, 
		self->needspatch = (ret < 0);

		if (self->needspatch) {

			IRDA_ERROR("STIR421X: Couldn't upload patch\n");

			goto err_out_5;

			goto err_out_6;

		}



		/* replace IrDA class descriptor with what patched device is now reporting */

		irda_desc = irda_usb_find_class_desc (self->usbintf);

		if (irda_desc == NULL) {

			ret = -ENODEV;

			goto err_out_5;

			goto err_out_6;

		}

		if (self->irda_desc)

			kfree (self->irda_desc);
@@ -1782,9 +1776,10 @@ static int irda_usb_probe(struct usb_interface *intf, 
	}



	return 0;



err_out_5:

err_out_6:

	unregister_netdev(self->netdev);

err_out_5:

	kfree(self->tx_buff);

err_out_4:

	kfree(self->speed_buff);

err_out_3:

drivers/net/irda/irda-usb.h

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ struct irda_usb_cb { 
	struct irlap_cb   *irlap;	/* The link layer we are binded to */

	struct qos_info qos;

	char *speed_buff;		/* Buffer for speed changes */

	char *tx_buff;



	struct timeval stamp;

	struct timeval now;

drivers/net/irda/vlsi_ir.c

+8 −8
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static void vlsi_proc_pdev(struct seq_file *seq, struct pci_dev *pdev) 
	unsigned i;



	seq_printf(seq, "\n%s (vid/did: %04x/%04x)\n",

		   PCIDEV_NAME(pdev), (int)pdev->vendor, (int)pdev->device);

		   pci_name(pdev), (int)pdev->vendor, (int)pdev->device);

	seq_printf(seq, "pci-power-state: %u\n", (unsigned) pdev->current_state);

	seq_printf(seq, "resources: irq=%u / io=0x%04x / dma_mask=0x%016Lx\n",

		   pdev->irq, (unsigned)pci_resource_start(pdev, 0), (unsigned long long)pdev->dma_mask);
@@ -1401,7 +1401,7 @@ static void vlsi_tx_timeout(struct net_device *ndev) 


	if (vlsi_start_hw(idev))

		IRDA_ERROR("%s: failed to restart hw - %s(%s) unusable!\n",

			   __FUNCTION__, PCIDEV_NAME(idev->pdev), ndev->name);

			   __FUNCTION__, pci_name(idev->pdev), ndev->name);

	else

		netif_start_queue(ndev);

}
@@ -1643,7 +1643,7 @@ vlsi_irda_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		pdev->current_state = 0; /* hw must be running now */



	IRDA_MESSAGE("%s: IrDA PCI controller %s detected\n",

		     drivername, PCIDEV_NAME(pdev));

		     drivername, pci_name(pdev));



	if ( !pci_resource_start(pdev,0)

	     || !(pci_resource_flags(pdev,0) & IORESOURCE_IO) ) {
@@ -1728,7 +1728,7 @@ static void __devexit vlsi_irda_remove(struct pci_dev *pdev) 


	pci_set_drvdata(pdev, NULL);



	IRDA_MESSAGE("%s: %s removed\n", drivername, PCIDEV_NAME(pdev));

	IRDA_MESSAGE("%s: %s removed\n", drivername, pci_name(pdev));

}



#ifdef CONFIG_PM
@@ -1748,7 +1748,7 @@ static int vlsi_irda_suspend(struct pci_dev *pdev, pm_message_t state) 


	if (!ndev) {

		IRDA_ERROR("%s - %s: no netdevice \n",

			   __FUNCTION__, PCIDEV_NAME(pdev));

			   __FUNCTION__, pci_name(pdev));

		return 0;

	}

	idev = ndev->priv;
@@ -1759,7 +1759,7 @@ static int vlsi_irda_suspend(struct pci_dev *pdev, pm_message_t state) 
			pdev->current_state = state.event;

		}

		else

			IRDA_ERROR("%s - %s: invalid suspend request %u -> %u\n", __FUNCTION__, PCIDEV_NAME(pdev), pdev->current_state, state.event);

			IRDA_ERROR("%s - %s: invalid suspend request %u -> %u\n", __FUNCTION__, pci_name(pdev), pdev->current_state, state.event);

		up(&idev->sem);

		return 0;

	}
@@ -1787,7 +1787,7 @@ static int vlsi_irda_resume(struct pci_dev *pdev) 


	if (!ndev) {

		IRDA_ERROR("%s - %s: no netdevice \n",

			   __FUNCTION__, PCIDEV_NAME(pdev));

			   __FUNCTION__, pci_name(pdev));

		return 0;

	}

	idev = ndev->priv;
@@ -1795,7 +1795,7 @@ static int vlsi_irda_resume(struct pci_dev *pdev) 
	if (pdev->current_state == 0) {

		up(&idev->sem);

		IRDA_WARNING("%s - %s: already resumed\n",

			     __FUNCTION__, PCIDEV_NAME(pdev));

			     __FUNCTION__, pci_name(pdev));

		return 0;

	}

drivers/net/irda/vlsi_ir.h

+0 −33
Original line number Diff line number Diff line
@@ -41,39 +41,6 @@ 
#define PCI_CLASS_SUBCLASS_MASK		0xffff

#endif



/* in recent 2.5 interrupt handlers have non-void return value */

#ifndef IRQ_RETVAL

typedef void irqreturn_t;

#define IRQ_NONE

#define IRQ_HANDLED

#define IRQ_RETVAL(x)

#endif



/* some stuff need to check kernelversion. Not all 2.5 stuff was present

 * in early 2.5.x - the test is merely to separate 2.4 from 2.5

 */

#include <linux/version.h>



#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)



/* PDE() introduced in 2.5.4 */

#ifdef CONFIG_PROC_FS

#define PDE(inode) ((inode)->i_private)

#endif



/* irda crc16 calculation exported in 2.5.42 */

#define irda_calc_crc16(fcs,buf,len)	(GOOD_FCS)



/* we use this for unified pci device name access */

#define PCIDEV_NAME(pdev)	((pdev)->name)



#else /* 2.5 or later */



/* whatever we get from the associated struct device - bus:slot:dev.fn id */

#define PCIDEV_NAME(pdev)	(pci_name(pdev))



#endif



/* ================================================================ */



/* non-standard PCI registers */

include/linux/Kbuild

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ header-y += hysdn_if.h 
header-y += i2c-dev.h

header-y += i8k.h

header-y += icmp.h

header-y += if_addr.h

header-y += if_arcnet.h

header-y += if_arp.h

header-y += if_bonding.h
@@ -79,7 +78,6 @@ header-y += if_fddi.h 
header-y += if.h

header-y += if_hippi.h

header-y += if_infiniband.h

header-y += if_link.h

header-y += if_packet.h

header-y += if_plip.h

header-y += if_ppp.h
@@ -213,6 +211,7 @@ unifdef-y += hpet.h 
unifdef-y += i2c.h

unifdef-y += i2o-dev.h

unifdef-y += icmpv6.h

unifdef-y += if_addr.h

unifdef-y += if_bridge.h

unifdef-y += if_ec.h

unifdef-y += if_eql.h
@@ -220,6 +219,7 @@ unifdef-y += if_ether.h 
unifdef-y += if_fddi.h

unifdef-y += if_frad.h

unifdef-y += if_ltalk.h

unifdef-y += if_link.h

unifdef-y += if_pppox.h

unifdef-y += if_shaper.h

unifdef-y += if_tr.h