diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-30 20:36:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-30 20:36:45 -0400 |
| commit | 817b33d38f81c8736d39283c35c886ae4668f1af (patch) | |
| tree | 64f60a88baf8b48c350d680f8b69fa6c759c3a82 /drivers/atm/ambassador.c | |
| parent | 84d88d5d4efc37dfb8a93a4a58d8a227ee86ffa4 (diff) | |
| parent | 8c185ab6185bf5e67766edb000ce428269364c86 (diff) | |
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.
Diffstat (limited to 'drivers/atm/ambassador.c')
| -rw-r--r-- | drivers/atm/ambassador.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c index 703364b52170..66e181345b3a 100644 --- a/drivers/atm/ambassador.c +++ b/drivers/atm/ambassador.c | |||
| @@ -1306,14 +1306,6 @@ static void amb_close (struct atm_vcc * atm_vcc) { | |||
| 1306 | return; | 1306 | return; |
| 1307 | } | 1307 | } |
| 1308 | 1308 | ||
| 1309 | /********** Set socket options for a VC **********/ | ||
| 1310 | |||
| 1311 | // int amb_getsockopt (struct atm_vcc * atm_vcc, int level, int optname, void * optval, int optlen); | ||
| 1312 | |||
| 1313 | /********** Set socket options for a VC **********/ | ||
| 1314 | |||
| 1315 | // int amb_setsockopt (struct atm_vcc * atm_vcc, int level, int optname, void * optval, int optlen); | ||
| 1316 | |||
| 1317 | /********** Send **********/ | 1309 | /********** Send **********/ |
| 1318 | 1310 | ||
| 1319 | static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) { | 1311 | static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) { |