diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-14 13:08:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-14 13:08:24 -0400 |
| commit | 6aa5fc434958d15a4d66d922d0416dfb03c07def (patch) | |
| tree | c68811b0e38afe68156022bed324d8df25fb45be /drivers/net/wan/hostess_sv11.c | |
| parent | 362a61ad61199e19a61b8e432015e2586b288f5b (diff) | |
| parent | 9ee6b7f1556e7889eff4666483b1b554d4686cd4 (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: (73 commits)
net: Fix typo in net/core/sock.c.
ppp: Do not free not yet unregistered net device.
netfilter: xt_iprange: module aliases for xt_iprange
netfilter: ctnetlink: dump conntrack ID in event messages
irda: Fix a misalign access issue. (v2)
sctp: Fix use of uninitialized pointer
cipso: Relax too much careful cipso hash function.
tcp FRTO: work-around inorder receivers
tcp FRTO: Fix fallback to conventional recovery
New maintainer for Intel ethernet adapters
DM9000: Use delayed work to update MII PHY state
DM9000: Update and fix driver debugging messages
DM9000: Add __devinit and __devexit attributes to probe and remove
sky2: fix simple define thinko
[netdrvr] sfc: sfc: Add self-test support
[netdrvr] sfc: Increment rx_reset when reported as driver event
[netdrvr] sfc: Remove unused macro EFX_XAUI_RETRAIN_MAX
[netdrvr] sfc: Fix code formatting
[netdrvr] sfc: Remove kernel-doc comments for removed members of struct efx_nic
[netdrvr] sfc: Remove garbage from comment
...
Diffstat (limited to 'drivers/net/wan/hostess_sv11.c')
| -rw-r--r-- | drivers/net/wan/hostess_sv11.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wan/hostess_sv11.c b/drivers/net/wan/hostess_sv11.c index 83dbc924fcb5..f3065d3473fd 100644 --- a/drivers/net/wan/hostess_sv11.c +++ b/drivers/net/wan/hostess_sv11.c | |||
| @@ -75,7 +75,7 @@ static void hostess_input(struct z8530_channel *c, struct sk_buff *skb) | |||
| 75 | 75 | ||
| 76 | static int hostess_open(struct net_device *d) | 76 | static int hostess_open(struct net_device *d) |
| 77 | { | 77 | { |
| 78 | struct sv11_device *sv11=d->priv; | 78 | struct sv11_device *sv11=d->ml_priv; |
| 79 | int err = -1; | 79 | int err = -1; |
| 80 | 80 | ||
| 81 | /* | 81 | /* |
| @@ -128,7 +128,7 @@ static int hostess_open(struct net_device *d) | |||
| 128 | 128 | ||
| 129 | static int hostess_close(struct net_device *d) | 129 | static int hostess_close(struct net_device *d) |
| 130 | { | 130 | { |
| 131 | struct sv11_device *sv11=d->priv; | 131 | struct sv11_device *sv11=d->ml_priv; |
| 132 | /* | 132 | /* |
| 133 | * Discard new frames | 133 | * Discard new frames |
| 134 | */ | 134 | */ |
| @@ -159,14 +159,14 @@ static int hostess_close(struct net_device *d) | |||
| 159 | 159 | ||
| 160 | static int hostess_ioctl(struct net_device *d, struct ifreq *ifr, int cmd) | 160 | static int hostess_ioctl(struct net_device *d, struct ifreq *ifr, int cmd) |
| 161 | { | 161 | { |
| 162 | /* struct sv11_device *sv11=d->priv; | 162 | /* struct sv11_device *sv11=d->ml_priv; |
| 163 | z8530_ioctl(d,&sv11->sync.chanA,ifr,cmd) */ | 163 | z8530_ioctl(d,&sv11->sync.chanA,ifr,cmd) */ |
| 164 | return sppp_do_ioctl(d, ifr,cmd); | 164 | return sppp_do_ioctl(d, ifr,cmd); |
| 165 | } | 165 | } |
| 166 | 166 | ||
| 167 | static struct net_device_stats *hostess_get_stats(struct net_device *d) | 167 | static struct net_device_stats *hostess_get_stats(struct net_device *d) |
| 168 | { | 168 | { |
| 169 | struct sv11_device *sv11=d->priv; | 169 | struct sv11_device *sv11=d->ml_priv; |
| 170 | if(sv11) | 170 | if(sv11) |
| 171 | return z8530_get_stats(&sv11->sync.chanA); | 171 | return z8530_get_stats(&sv11->sync.chanA); |
| 172 | else | 172 | else |
| @@ -179,7 +179,7 @@ static struct net_device_stats *hostess_get_stats(struct net_device *d) | |||
| 179 | 179 | ||
| 180 | static int hostess_queue_xmit(struct sk_buff *skb, struct net_device *d) | 180 | static int hostess_queue_xmit(struct sk_buff *skb, struct net_device *d) |
| 181 | { | 181 | { |
| 182 | struct sv11_device *sv11=d->priv; | 182 | struct sv11_device *sv11=d->ml_priv; |
| 183 | return z8530_queue_xmit(&sv11->sync.chanA, skb); | 183 | return z8530_queue_xmit(&sv11->sync.chanA, skb); |
| 184 | } | 184 | } |
| 185 | 185 | ||
| @@ -325,6 +325,7 @@ static struct sv11_device *sv11_init(int iobase, int irq) | |||
| 325 | /* | 325 | /* |
| 326 | * Initialise the PPP components | 326 | * Initialise the PPP components |
| 327 | */ | 327 | */ |
| 328 | d->ml_priv = sv; | ||
| 328 | sppp_attach(&sv->netdev); | 329 | sppp_attach(&sv->netdev); |
| 329 | 330 | ||
| 330 | /* | 331 | /* |
| @@ -333,7 +334,6 @@ static struct sv11_device *sv11_init(int iobase, int irq) | |||
| 333 | 334 | ||
| 334 | d->base_addr = iobase; | 335 | d->base_addr = iobase; |
| 335 | d->irq = irq; | 336 | d->irq = irq; |
| 336 | d->priv = sv; | ||
| 337 | 337 | ||
| 338 | if(register_netdev(d)) | 338 | if(register_netdev(d)) |
| 339 | { | 339 | { |