diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-07-24 03:38:13 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-24 03:38:13 -0400 |
| commit | b71426eb10d904d421b36f51f93c8d0ba558edac (patch) | |
| tree | a8c7088a6b89499134e01750652aa55f2baa890f /drivers/net/wan/hdlc_x25.c | |
| parent | 8419dc8a34d765f2ff1aa4051084d54cfeff09cf (diff) | |
| parent | abb5a5cc6bba1516403146c5b79036fe843beb70 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/wan/hdlc_x25.c')
| -rw-r--r-- | drivers/net/wan/hdlc_x25.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wan/hdlc_x25.c b/drivers/net/wan/hdlc_x25.c index 07e5eef1fe0f..a867fb411f89 100644 --- a/drivers/net/wan/hdlc_x25.c +++ b/drivers/net/wan/hdlc_x25.c | |||
| @@ -212,6 +212,7 @@ int hdlc_x25_ioctl(struct net_device *dev, struct ifreq *ifr) | |||
| 212 | dev->hard_header = NULL; | 212 | dev->hard_header = NULL; |
| 213 | dev->type = ARPHRD_X25; | 213 | dev->type = ARPHRD_X25; |
| 214 | dev->addr_len = 0; | 214 | dev->addr_len = 0; |
| 215 | netif_dormant_off(dev); | ||
| 215 | return 0; | 216 | return 0; |
| 216 | } | 217 | } |
| 217 | 218 | ||