Skip to content

Commit

Permalink
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Browse files Browse the repository at this point in the history 
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (30 commits)
  [TIPC]: Initial activation message now includes TIPC version number
  [TIPC]: Improve response to requests for node/link information
  [TIPC]: Fixed skb_under_panic caused by tipc_link_bundle_buf
  [IrDA]: Fix the AU1000 FIR dependencies
  [IrDA]: Fix RCU lock pairing on error path
  [XFRM]: unexport xfrm_state_mtu
  [NET]: make skb_release_data() static
  [NETFILTE] ipv4: Fix typo (Bugzilla #6753)
  [IrDA]: MCS7780 usb_driver struct should be static
  [BNX2]: Turn off link during shutdown
  [BNX2]: Use dev_kfree_skb() instead of the _irq version
  [ATM]: basic sysfs support for ATM devices
  [ATM]: [suni] change suni_init to __devinit
  [ATM]: [iphase] should be __devinit not __init
  [ATM]: [idt77105] should be __devinit not __init
  [BNX2]: Add NETIF_F_TSO_ECN
  [NET]: Add ECN support for TSO
  [AF_UNIX]: Datagram getpeersec
  [NET]: Fix logical error in skb_gso_ok
  [PKT_SCHED]: PSCHED_TADD() and PSCHED_TADD2() can result,tv_usec >= 1000000
  ...
  • Loading branch information
Linus Torvalds committed Jun 30, 2006
2 parents 6002e45 + 0702056 commit 74e651f
Show file tree
Hide file tree
Showing 89 changed files with 520 additions and 148 deletions.
1 change: 0 additions & 1 deletion arch/x86_64/kernel/functionlist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,6 @@
*(.text.__end_that_request_first)
*(.text.wake_up_bit)
*(.text.unuse_mm)
*(.text.skb_release_data)
*(.text.shrink_icache_memory)
*(.text.sched_balance_self)
*(.text.__pmd_alloc)
Expand Down
2 changes: 1 addition & 1 deletion drivers/atm/he.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1018,7 +1018,7 @@ he_init_irq(struct he_dev *he_dev)
return 0;
}

static int __init
static int __devinit
he_start(struct atm_dev *dev)
{
struct he_dev *he_dev;
Expand Down
2 changes: 1 addition & 1 deletion drivers/atm/idt77105.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ static const struct atmphy_ops idt77105_ops = {
};


int idt77105_init(struct atm_dev *dev)
int __devinit idt77105_init(struct atm_dev *dev)
{
dev->phy = &idt77105_ops;
return 0;
Expand Down
2 changes: 1 addition & 1 deletion drivers/atm/idt77105.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
#define IDT77105_CTRSEL_RHEC 0x01 /* W, Rx HEC Error Counter */

#ifdef __KERNEL__
int idt77105_init(struct atm_dev *dev) __init;
int idt77105_init(struct atm_dev *dev);
#endif

/*
Expand Down
4 changes: 2 additions & 2 deletions drivers/atm/iphase.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2284,7 +2284,7 @@ static int reset_sar(struct atm_dev *dev)
}


static int __init ia_init(struct atm_dev *dev)
static int __devinit ia_init(struct atm_dev *dev)
{
IADEV *iadev;
unsigned long real_base;
Expand Down Expand Up @@ -2480,7 +2480,7 @@ static void ia_free_rx(IADEV *iadev)
iadev->rx_dle_dma);
}

static int __init ia_start(struct atm_dev *dev)
static int __devinit ia_start(struct atm_dev *dev)
{
IADEV *iadev;
int error;
Expand Down
2 changes: 1 addition & 1 deletion drivers/atm/suni.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ static const struct atmphy_ops suni_ops = {
};


int suni_init(struct atm_dev *dev)
int __devinit suni_init(struct atm_dev *dev)
{
unsigned char mri;

Expand Down
32 changes: 21 additions & 11 deletions drivers/net/bnx2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@

#define DRV_MODULE_NAME "bnx2"
#define PFX DRV_MODULE_NAME ": "
#define DRV_MODULE_VERSION "1.4.42"
#define DRV_MODULE_RELDATE "June 12, 2006"
#define DRV_MODULE_VERSION "1.4.43"
#define DRV_MODULE_RELDATE "June 28, 2006"

#define RUN_AT(x) (jiffies + (x))

Expand Down Expand Up @@ -1676,7 +1676,7 @@ bnx2_tx_int(struct bnx2 *bp)

tx_free_bd += last + 1;

dev_kfree_skb_irq(skb);
dev_kfree_skb(skb);

hw_cons = bp->hw_tx_cons =
sblk->status_tx_quick_consumer_index0;
Expand Down Expand Up @@ -1824,7 +1824,7 @@ bnx2_rx_int(struct bnx2 *bp, int budget)
if ((len > (bp->dev->mtu + ETH_HLEN)) &&
(ntohs(skb->protocol) != 0x8100)) {

dev_kfree_skb_irq(skb);
dev_kfree_skb(skb);
goto next_rx;

}
Expand Down Expand Up @@ -3643,7 +3643,7 @@ bnx2_free_tx_skbs(struct bnx2 *bp)
skb_shinfo(skb)->frags[j].size,
PCI_DMA_TODEVICE);
}
dev_kfree_skb_any(skb);
dev_kfree_skb(skb);
i += j + 1;
}

Expand All @@ -3669,7 +3669,7 @@ bnx2_free_rx_skbs(struct bnx2 *bp)

rx_buf->skb = NULL;

dev_kfree_skb_any(skb);
dev_kfree_skb(skb);
}
}

Expand Down Expand Up @@ -3999,7 +3999,7 @@ bnx2_run_loopback(struct bnx2 *bp, int loopback_mode)
udelay(5);

pci_unmap_single(bp->pdev, map, pkt_size, PCI_DMA_TODEVICE);
dev_kfree_skb_irq(skb);
dev_kfree_skb(skb);

if (bp->status_blk->status_tx_quick_consumer_index0 != bp->tx_prod) {
goto loopback_test_done;
Expand Down Expand Up @@ -4541,7 +4541,7 @@ bnx2_close(struct net_device *dev)
bnx2_netif_stop(bp);
del_timer_sync(&bp->timer);
if (bp->flags & NO_WOL_FLAG)
reset_code = BNX2_DRV_MSG_CODE_UNLOAD;
reset_code = BNX2_DRV_MSG_CODE_UNLOAD_LNK_DN;
else if (bp->wol)
reset_code = BNX2_DRV_MSG_CODE_SUSPEND_WOL;
else
Expand Down Expand Up @@ -5128,6 +5128,16 @@ bnx2_set_rx_csum(struct net_device *dev, u32 data)
return 0;
}

static int
bnx2_set_tso(struct net_device *dev, u32 data)
{
if (data)
dev->features |= NETIF_F_TSO | NETIF_F_TSO_ECN;
else
dev->features &= ~(NETIF_F_TSO | NETIF_F_TSO_ECN);
return 0;
}

#define BNX2_NUM_STATS 46

static struct {
Expand Down Expand Up @@ -5445,7 +5455,7 @@ static struct ethtool_ops bnx2_ethtool_ops = {
.set_sg = ethtool_op_set_sg,
#ifdef BCM_TSO
.get_tso = ethtool_op_get_tso,
.set_tso = ethtool_op_set_tso,
.set_tso = bnx2_set_tso,
#endif
.self_test_count = bnx2_self_test_count,
.self_test = bnx2_self_test,
Expand Down Expand Up @@ -5926,7 +5936,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
#endif
#ifdef BCM_TSO
dev->features |= NETIF_F_TSO;
dev->features |= NETIF_F_TSO | NETIF_F_TSO_ECN;
#endif

netif_carrier_off(bp->dev);
Expand Down Expand Up @@ -5968,7 +5978,7 @@ bnx2_suspend(struct pci_dev *pdev, pm_message_t state)
netif_device_detach(dev);
del_timer_sync(&bp->timer);
if (bp->flags & NO_WOL_FLAG)
reset_code = BNX2_DRV_MSG_CODE_UNLOAD;
reset_code = BNX2_DRV_MSG_CODE_UNLOAD_LNK_DN;
else if (bp->wol)
reset_code = BNX2_DRV_MSG_CODE_SUSPEND_WOL;
else
Expand Down
1 change: 1 addition & 0 deletions drivers/net/bnx2.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4174,6 +4174,7 @@ struct fw_info {
#define BNX2_DRV_MSG_CODE_PULSE 0x06000000
#define BNX2_DRV_MSG_CODE_DIAG 0x07000000
#define BNX2_DRV_MSG_CODE_SUSPEND_NO_WOL 0x09000000
#define BNX2_DRV_MSG_CODE_UNLOAD_LNK_DN 0x0b000000

#define BNX2_DRV_MSG_DATA 0x00ff0000
#define BNX2_DRV_MSG_DATA_WAIT0 0x00010000
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/irda/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ config TOSHIBA_FIR

config AU1000_FIR
tristate "Alchemy Au1000 SIR/FIR"
depends on MIPS_AU1000 && IRDA
depends on SOC_AU1000 && IRDA

config SMC_IRCC_FIR
tristate "SMSC IrCC (EXPERIMENTAL)"
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/irda/mcs7780.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ static int transceiver_type = MCS_TSC_VISHAY;
module_param(transceiver_type, int, 0444);
MODULE_PARM_DESC(transceiver_type, "IR transceiver type, see mcs7780.h.");

struct usb_driver mcs_driver = {
static struct usb_driver mcs_driver = {
.name = "mcs7780",
.probe = mcs_probe,
.disconnect = mcs_disconnect,
Expand Down
1 change: 1 addition & 0 deletions include/asm-alpha/socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
#define SCM_TIMESTAMP SO_TIMESTAMP

#define SO_PEERSEC 30
#define SO_PASSSEC 34

/* Security levels - as per NRL IPv6 - don't actually do anything */
#define SO_SECURITY_AUTHENTICATION 19
Expand Down
1 change: 1 addition & 0 deletions include/asm-arm/socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,6 @@
#define SO_ACCEPTCONN 30

#define SO_PEERSEC 31
#define SO_PASSSEC 34

#endif /* _ASM_SOCKET_H */
1 change: 1 addition & 0 deletions include/asm-arm26/socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,6 @@
#define SO_ACCEPTCONN 30

#define SO_PEERSEC 31
#define SO_PASSSEC 34

#endif /* _ASM_SOCKET_H */
1 change: 1 addition & 0 deletions include/asm-cris/socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
#define SO_ACCEPTCONN 30

#define SO_PEERSEC 31
#define SO_PASSSEC 34

#endif /* _ASM_SOCKET_H */

Expand Down
1 change: 1 addition & 0 deletions include/asm-frv/socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
#define SO_ACCEPTCONN 30

#define SO_PEERSEC 31
#define SO_PASSSEC 34

#endif /* _ASM_SOCKET_H */

1 change: 1 addition & 0 deletions include/asm-h8300/socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,6 @@
#define SO_ACCEPTCONN 30

#define SO_PEERSEC 31
#define SO_PASSSEC 34

#endif /* _ASM_SOCKET_H */
1 change: 1 addition & 0 deletions include/asm-i386/socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,6 @@
#define SO_ACCEPTCONN 30

#define SO_PEERSEC 31
#define SO_PASSSEC 34

#endif /* _ASM_SOCKET_H */
1 change: 1 addition & 0 deletions include/asm-ia64/socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,6 @@
#define SO_ACCEPTCONN 30

#define SO_PEERSEC 31
#define SO_PASSSEC 34

#endif /* _ASM_IA64_SOCKET_H */
1 change: 1 addition & 0 deletions include/asm-m32r/socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,6 @@
#define SO_ACCEPTCONN 30

#define SO_PEERSEC 31
#define SO_PASSSEC 34

#endif /* _ASM_M32R_SOCKET_H */
1 change: 1 addition & 0 deletions include/asm-m68k/socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,6 @@
#define SO_ACCEPTCONN 30

#define SO_PEERSEC 31
#define SO_PASSSEC 34

#endif /* _ASM_SOCKET_H */
1 change: 1 addition & 0 deletions include/asm-mips/socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ To add: #define SO_REUSEPORT 0x0200 /* Allow local address and port reuse. */
#define SO_PEERSEC 30
#define SO_SNDBUFFORCE 31
#define SO_RCVBUFFORCE 33
#define SO_PASSSEC 34

#ifdef __KERNEL__

Expand Down
1 change: 1 addition & 0 deletions include/asm-parisc/socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,6 @@
#define SO_ACCEPTCONN 0x401c

#define SO_PEERSEC 0x401d
#define SO_PASSSEC 0x401e

#endif /* _ASM_SOCKET_H */
1 change: 1 addition & 0 deletions include/asm-powerpc/socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,6 @@
#define SO_ACCEPTCONN 30

#define SO_PEERSEC 31
#define SO_PASSSEC 34

#endif /* _ASM_POWERPC_SOCKET_H */
1 change: 1 addition & 0 deletions include/asm-s390/socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,6 @@
#define SO_ACCEPTCONN 30

#define SO_PEERSEC 31
#define SO_PASSSEC 34

#endif /* _ASM_SOCKET_H */
1 change: 1 addition & 0 deletions include/asm-sh/socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,6 @@
#define SO_ACCEPTCONN 30

#define SO_PEERSEC 31
#define SO_PASSSEC 34

#endif /* __ASM_SH_SOCKET_H */
1 change: 1 addition & 0 deletions include/asm-sparc/socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
#define SCM_TIMESTAMP SO_TIMESTAMP

#define SO_PEERSEC 0x001e
#define SO_PASSSEC 0x001f

/* Security levels - as per NRL IPv6 - don't actually do anything */
#define SO_SECURITY_AUTHENTICATION 0x5001
Expand Down
1 change: 1 addition & 0 deletions include/asm-sparc64/socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
#define SCM_TIMESTAMP SO_TIMESTAMP

#define SO_PEERSEC 0x001e
#define SO_PASSSEC 0x001f

/* Security levels - as per NRL IPv6 - don't actually do anything */
#define SO_SECURITY_AUTHENTICATION 0x5001
Expand Down
1 change: 1 addition & 0 deletions include/asm-v850/socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,6 @@
#define SO_ACCEPTCONN 30

#define SO_PEERSEC 31
#define SO_PASSSEC 34

#endif /* __V850_SOCKET_H__ */
1 change: 1 addition & 0 deletions include/asm-x86_64/socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,6 @@
#define SO_ACCEPTCONN 30

#define SO_PEERSEC 31
#define SO_PASSSEC 34

#endif /* _ASM_SOCKET_H */
1 change: 1 addition & 0 deletions include/asm-xtensa/socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,6 @@

#define SO_ACCEPTCONN 30
#define SO_PEERSEC 31
#define SO_PASSSEC 34

#endif /* _XTENSA_SOCKET_H */
4 changes: 3 additions & 1 deletion include/linux/atmdev.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define LINUX_ATMDEV_H


#include <linux/device.h>
#include <linux/atmapi.h>
#include <linux/atm.h>
#include <linux/atmioc.h>
Expand Down Expand Up @@ -358,6 +359,7 @@ struct atm_dev {
struct proc_dir_entry *proc_entry; /* proc entry */
char *proc_name; /* proc entry name */
#endif
struct class_device class_dev; /* sysfs class device */
struct list_head dev_list; /* linkage */
};

Expand Down Expand Up @@ -459,7 +461,7 @@ static inline void atm_dev_put(struct atm_dev *dev)
BUG_ON(!test_bit(ATM_DF_REMOVED, &dev->flags));
if (dev->ops->dev_close)
dev->ops->dev_close(dev);
kfree(dev);
class_device_put(&dev->class_dev);
}
}

Expand Down
1 change: 1 addition & 0 deletions include/linux/net.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ typedef enum {
#define SOCK_ASYNC_WAITDATA 1
#define SOCK_NOSPACE 2
#define SOCK_PASSCRED 3
#define SOCK_PASSSEC 4

#ifndef ARCH_HAS_SOCKET_TYPES
/**
Expand Down
Loading

0 comments on commit 74e651f

Please sign in to comment.