sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Merge branch 'for-next/net'

This commit is contained in:
Sascha Hauer 2015-04-13 12:57:13 +02:00
parent 9f13039b55 e44c9b04c4
commit c41b60fe6a
5 changed files with 6560 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/Kconfig
View File

@ -76,6 +76,14 @@ config DRIVER_NET_DM9K
depends on HAS_DM9000
select PHYLIB
config DRIVER_NET_E1000
bool "Intel e1000 ethernet driver"
depends on PCI
select PHYLIB
help
This is a driver for the Gigabit Ethernet PCI network cards based on
the Intel e1000 chips.
config DRIVER_NET_ENC28J60
bool "ENC28J60 support"
depends on SPI

1
drivers/net/Makefile
View File

@ -10,6 +10,7 @@ obj-$(CONFIG_DRIVER_NET_CPSW) += cpsw.o
obj-$(CONFIG_DRIVER_NET_DAVINCI_EMAC) += davinci_emac.o
obj-$(CONFIG_DRIVER_NET_DESIGNWARE) += designware.o
obj-$(CONFIG_DRIVER_NET_DM9K) += dm9k.o
obj-$(CONFIG_DRIVER_NET_E1000) += e1000.o
obj-$(CONFIG_DRIVER_NET_ENC28J60) += enc28j60.o
obj-$(CONFIG_DRIVER_NET_EP93XX) += ep93xx.o
obj-$(CONFIG_DRIVER_NET_ETHOC) += ethoc.o

4455
drivers/net/e1000.c Normal file
View File

File diff suppressed because it is too large Load Diff

2093
drivers/net/e1000.h Normal file
View File

File diff suppressed because it is too large Load Diff

6
net/ping.c
View File

@ -67,6 +67,9 @@ static int do_ping(int argc, char *argv[])
return 1;
}
ping_state = PING_STATE_INIT;
ping_sequence_number = 0;
ping_con = net_icmp_new(net_ping_ip, ping_handler, NULL);
if (IS_ERR(ping_con)) {
ret = PTR_ERR(ping_con);
@ -78,9 +81,6 @@ static int do_ping(int argc, char *argv[])
if (ret)
goto out_unreg;
ping_state = PING_STATE_INIT;
ping_sequence_number = 0;
while (ping_state == PING_STATE_INIT) {
if (ctrlc()) {
ret = -EINTR;