diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-10-25 18:10:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-10-25 18:10:25 -0700 |
| commit | e734088bdf2033c779f9f2c8657bc206d4701b3c (patch) | |
| tree | 721a4b22cb5974b369eb684508c35d83ff62ac97 /include/linux/netdevice.h | |
| parent | 403f291258456ffc3beb40bc92c0006569e20bc0 (diff) | |
| parent | 768c0266df18d27e7c088c6bbe130b50bf463cb2 (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index c102cdce2ebe..79c65e9ac5a1 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -937,7 +937,7 @@ extern int weight_p; extern unsigned long netdev_fc_xoff; extern atomic_t netdev_dropping; extern int netdev_set_master(struct net_device *dev, struct net_device *master); -extern int skb_checksum_help(struct sk_buff **pskb, int inward); +extern int skb_checksum_help(struct sk_buff *skb, int inward); #ifdef CONFIG_SYSCTL extern char *net_sysctl_strdup(const char *s); |