Commit 817b33d3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  ax25: Fix possible oops in ax25_make_new
  net: restore tx timestamping for accelerated vlans
  Phonet: fix mutex imbalance
  sit: fix off-by-one in ipip6_tunnel_get_prl
  net: Fix sock_wfree() race
  net: Make setsockopt() optlen be unsigned.
parents 84d88d5d 8c185ab6

drivers/atm/ambassador.c

+0 −8
Original line number Diff line number Diff line
@@ -1306,14 +1306,6 @@ static void amb_close (struct atm_vcc * atm_vcc) { 
  return;

}



/********** Set socket options for a VC **********/



// int amb_getsockopt (struct atm_vcc * atm_vcc, int level, int optname, void * optval, int optlen);



/********** Set socket options for a VC **********/



// int amb_setsockopt (struct atm_vcc * atm_vcc, int level, int optname, void * optval, int optlen);



/********** Send **********/



static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {

drivers/atm/eni.c

+1 −1
Original line number Diff line number Diff line
@@ -2031,7 +2031,7 @@ static int eni_getsockopt(struct atm_vcc *vcc,int level,int optname, 




static int eni_setsockopt(struct atm_vcc *vcc,int level,int optname,

    void __user *optval,int optlen)

    void __user *optval,unsigned int optlen)

{

	return -EINVAL;

}

drivers/atm/firestream.c

+1 −1
Original line number Diff line number Diff line
@@ -1244,7 +1244,7 @@ static int fs_getsockopt(struct atm_vcc *vcc,int level,int optname, 




static int fs_setsockopt(struct atm_vcc *vcc,int level,int optname,

			 void __user *optval,int optlen)

			 void __user *optval,unsigned int optlen)

{

	func_enter ();

	func_exit ();

drivers/atm/fore200e.c

+1 −1
Original line number Diff line number Diff line
@@ -1795,7 +1795,7 @@ fore200e_getsockopt(struct atm_vcc* vcc, int level, int optname, void __user *op 




static int

fore200e_setsockopt(struct atm_vcc* vcc, int level, int optname, void __user *optval, int optlen)

fore200e_setsockopt(struct atm_vcc* vcc, int level, int optname, void __user *optval, unsigned int optlen)

{

    /* struct fore200e* fore200e = FORE200E_DEV(vcc->dev); */

drivers/atm/horizon.c

+1 −1
Original line number Diff line number Diff line
@@ -2590,7 +2590,7 @@ static int hrz_getsockopt (struct atm_vcc * atm_vcc, int level, int optname, 
}



static int hrz_setsockopt (struct atm_vcc * atm_vcc, int level, int optname,

			   void *optval, int optlen) {

			   void *optval, unsigned int optlen) {

  hrz_dev * dev = HRZ_DEV(atm_vcc->dev);

  PRINTD (DBG_FLOW|DBG_VCC, "hrz_setsockopt");

  switch (level) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE