diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 08:34:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 08:34:36 -0800 |
| commit | a7c243b544c0e9f6775c2607decaa59d54fb9e11 (patch) | |
| tree | 86fdb4d2d6cef932af7497f28827e7d52b29e48c /arch/xtensa | |
| parent | 7df446e7e043b2ba5fd5de42529f9d797e8b501a (diff) | |
| parent | f406db8cba6bbce42b96490e6d31bdec229ad994 (diff) | |
| download | linux-a7c243b544c0e9f6775c2607decaa59d54fb9e11.tar.gz linux-a7c243b544c0e9f6775c2607decaa59d54fb9e11.tar.bz2 linux-a7c243b544c0e9f6775c2607decaa59d54fb9e11.zip | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'arch/xtensa')
| -rw-r--r-- | arch/xtensa/platform-iss/network.c | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/arch/xtensa/platform-iss/network.c b/arch/xtensa/platform-iss/network.c index 0682ffd38175..96b9bb4a478d 100644 --- a/arch/xtensa/platform-iss/network.c +++ b/arch/xtensa/platform-iss/network.c @@ -611,38 +611,6 @@ static int iss_net_change_mtu(struct net_device *dev, int new_mtu) return -EINVAL; } -static int iss_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) -{ -#if 0 - static const struct ethtool_drvinfo info = { - .cmd = ETHTOOL_GDRVINFO, - .driver = DRIVER_NAME, - .version = "42", - }; - void *useraddr; - u32 ethcmd; - - switch (cmd) { - case SIOCETHTOOL: - useraddr = ifr->ifr_data; - if (copy_from_user(ðcmd, useraddr, sizeof(ethcmd))) - return -EFAULT; - - switch (ethcmd) { - case ETHTOOL_GDRVINFO: - if (copy_to_user(useraddr, &info, sizeof(info))) - return -EFAULT; - return 0; - default: - return -EOPNOTSUPP; - } - default: - return -EINVAL; - } -#endif - return -EINVAL; -} - void iss_net_user_timer_expire(unsigned long _conn) { } @@ -730,7 +698,6 @@ static int iss_net_configure(int index, char *init) dev->tx_timeout = iss_net_tx_timeout; dev->set_mac_address = iss_net_set_mac; dev->change_mtu = iss_net_change_mtu; - dev->do_ioctl = iss_net_ioctl; dev->watchdog_timeo = (HZ >> 1); dev->irq = -1; |