diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-28 15:49:40 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-28 15:49:40 -0500 |
commit | 0191b625ca5a46206d2fb862bb08f36f2fcb3b31 (patch) | |
tree | 454d1842b1833d976da62abcbd5c47521ebe9bd7 /arch/um/os-Linux | |
parent | 54a696bd07c14d3b1192d03ce7269bc59b45209a (diff) | |
parent | eb56092fc168bf5af199d47af50c0d84a96db898 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429 commits)
net: Allow dependancies of FDDI & Tokenring to be modular.
igb: Fix build warning when DCA is disabled.
net: Fix warning fallout from recent NAPI interface changes.
gro: Fix potential use after free
sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
sfc: When disabling the NIC, close the device rather than unregistering it
sfc: SFT9001: Add cable diagnostics
sfc: Add support for multiple PHY self-tests
sfc: Merge top-level functions for self-tests
sfc: Clean up PHY mode management in loopback self-test
sfc: Fix unreliable link detection in some loopback modes
sfc: Generate unique names for per-NIC workqueues
802.3ad: use standard ethhdr instead of ad_header
802.3ad: generalize out mac address initializer
802.3ad: initialize ports LACPDU from const initializer
802.3ad: remove typedef around ad_system
802.3ad: turn ports is_individual into a bool
802.3ad: turn ports is_enabled into a bool
802.3ad: make ntt bool
ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
...
Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due
to the conversion to %pI (in this networking merge) and the addition of
doing IPv6 addresses (from the earlier merge of CIFS).
Diffstat (limited to 'arch/um/os-Linux')
-rw-r--r-- | arch/um/os-Linux/drivers/ethertap_kern.c | 2 | ||||
-rw-r--r-- | arch/um/os-Linux/drivers/tuntap_kern.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/os-Linux/drivers/ethertap_kern.c b/arch/um/os-Linux/drivers/ethertap_kern.c index 046a131f6104..7f6f9a71aae4 100644 --- a/arch/um/os-Linux/drivers/ethertap_kern.c +++ b/arch/um/os-Linux/drivers/ethertap_kern.c | |||
@@ -22,7 +22,7 @@ static void etap_init(struct net_device *dev, void *data) | |||
22 | struct ethertap_data *epri; | 22 | struct ethertap_data *epri; |
23 | struct ethertap_init *init = data; | 23 | struct ethertap_init *init = data; |
24 | 24 | ||
25 | pri = dev->priv; | 25 | pri = netdev_priv(dev); |
26 | epri = (struct ethertap_data *) pri->user; | 26 | epri = (struct ethertap_data *) pri->user; |
27 | epri->dev_name = init->dev_name; | 27 | epri->dev_name = init->dev_name; |
28 | epri->gate_addr = init->gate_addr; | 28 | epri->gate_addr = init->gate_addr; |
diff --git a/arch/um/os-Linux/drivers/tuntap_kern.c b/arch/um/os-Linux/drivers/tuntap_kern.c index 6b9e33d5de20..4048800e4696 100644 --- a/arch/um/os-Linux/drivers/tuntap_kern.c +++ b/arch/um/os-Linux/drivers/tuntap_kern.c | |||
@@ -21,7 +21,7 @@ static void tuntap_init(struct net_device *dev, void *data) | |||
21 | struct tuntap_data *tpri; | 21 | struct tuntap_data *tpri; |
22 | struct tuntap_init *init = data; | 22 | struct tuntap_init *init = data; |
23 | 23 | ||
24 | pri = dev->priv; | 24 | pri = netdev_priv(dev); |
25 | tpri = (struct tuntap_data *) pri->user; | 25 | tpri = (struct tuntap_data *) pri->user; |
26 | tpri->dev_name = init->dev_name; | 26 | tpri->dev_name = init->dev_name; |
27 | tpri->fixed_config = (init->dev_name != NULL); | 27 | tpri->fixed_config = (init->dev_name != NULL); |