--- zzzz-none-000/linux-2.6.39.4/net/ipv4/ipconfig.c 2011-08-03 19:43:28.000000000 +0000 +++ puma6-atom-6490-729/linux-2.6.39.4/net/ipv4/ipconfig.c 2021-11-10 13:38:18.000000000 +0000 @@ -29,6 +29,11 @@ * -- Josef Siemes , Aug 2002 */ +/******************************************************************************* + Includes Intel Corporation's changes/modifications dated: 11/2012. + Changed/modified portions - Copyright(c) 2012, Intel Corporation. +*******************************************************************************/ + #include #include #include @@ -193,6 +198,9 @@ if (user_dev_name[0] ? !strcmp(dev->name, user_dev_name) : (!(dev->flags & IFF_LOOPBACK) && (dev->flags & (IFF_POINTOPOINT|IFF_BROADCAST)) && +#if defined(CONFIG_ARCH_GEN3) && defined(CONFIG_UDMA) + strncmp(dev->name, "eth_udma", 8) && +#endif strncmp(dev->name, "dummy", 5))) return true; return false; @@ -464,7 +472,7 @@ struct arphdr *rarp; unsigned char *rarp_ptr; __be32 sip, tip; - unsigned char *sha, *tha; /* s for "source", t for "target" */ + unsigned char *tha; /* t for "target" */ struct ic_device *d; if (!net_eq(dev_net(dev), &init_net)) @@ -515,7 +523,6 @@ goto drop_unlock; /* should never happen */ /* Extract variable-width fields */ - sha = rarp_ptr; rarp_ptr += dev->addr_len; memcpy(&sip, rarp_ptr, 4); rarp_ptr += 4;