linux-toradex.git/net/irda, branch tegra

IRDA: Fix global type conflicts in net/irda/irsysctl.c v2

2011-09-16T23:17:09+00:00

The externs here didn't agree with the declarations in qos.c.

Better would be probably to move this into a header, but since it's
common practice to have naked externs with sysctls I left it for now.

Cc: samuel@sortiz.org
Signed-off-by: Andi Kleen 
Signed-off-by: David S. Miller

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

2011-06-21T05:29:08+00:00

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
	drivers/net/wireless/rtlwifi/pci.c
	net/netfilter/ipvs/ip_vs_core.c

net: Remove casts of void *

2011-06-17T03:19:27+00:00

Unnecessary casts of void * clutter the code.

These are the remainder casts after several specific
patches to remove netdev_priv and dev_priv.

Done via coccinelle script:

$ cat cast_void_pointer.cocci
@@
type T;
T *pt;
void *pv;
@@

- pt = (T *)pv;
+ pt = pv;

Signed-off-by: Joe Perches 
Acked-by: Paul Moore 
Signed-off-by: David S. Miller

irda: iriap: Use seperate lockdep class for irias_objects->hb_spinlock

2011-06-07T00:00:35+00:00

The SEQ output functions grab the obj->attrib->hb_spinlock lock of
sub-objects found in the hash traversal.  These locks are in a different
realm than the one used for the irias_objects hash table itself.

So put the latter into it's own lockdep class.

Reported-by: Dave Jones 
Signed-off-by: David S. Miller

irda: Fix error propagation in ircomm_lmp_connect_response()

2011-05-19T22:58:39+00:00

The variable 'ret' is set but unused, and this pointed out that
errors from irlmp_connect_response() are not propagated to the
caller.

Note that this is currently academic since irlmp_connect_response()
always returns 0. :-)

Signed-off-by: David S. Miller

irda: Kill set but unused variable 'bytes' in irlan_check_command_param()

2011-05-19T22:53:58+00:00

Signed-off-by: David S. Miller

irda: Kill set but unused variable 'clen' in ircomm_connect_indication()

2011-05-19T22:52:59+00:00

Signed-off-by: David S. Miller

irda: Kill set but unused vars 'saddr' and 'daddr' in irlan_provider_connect_indication()

2011-05-19T22:46:41+00:00

Signed-off-by: David S. Miller

net/irda/ircomm_tty.c: Use flip buffers to deliver data

2011-05-12T22:02:51+00:00

use tty_insert_flip_string and tty_flip_buffer_push to deliver incoming data
packets from the IrDA device instead of delivering the packets directly to the
line discipline. Following later approach resulted in warning "Sleeping function
called from invalid context".

Signed-off-by: Amit Virdi 
Acked-by: Alan Cox 
Signed-off-by: David S. Miller

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

2011-04-19T07:21:33+00:00

Conflicts:
	drivers/net/bnx2x/bnx2x_ethtool.c