--- zzzz-none-000/linux-2.6.19.2/net/core/ethtool.c 2007-01-10 19:10:37.000000000 +0000 +++ davinci-8020-5505/linux-2.6.19.2/net/core/ethtool.c 2008-04-10 12:21:44.000000000 +0000 @@ -112,7 +112,7 @@ static int ethtool_get_settings(struct net_device *dev, void __user *useraddr) { - struct ethtool_cmd cmd = { ETHTOOL_GSET }; + struct ethtool_cmd cmd = { .cmd = ETHTOOL_GSET }; int err; if (!dev->ethtool_ops->get_settings) @@ -204,7 +204,7 @@ static int ethtool_get_wol(struct net_device *dev, char __user *useraddr) { - struct ethtool_wolinfo wol = { ETHTOOL_GWOL }; + struct ethtool_wolinfo wol = { .cmd = ETHTOOL_GWOL }; if (!dev->ethtool_ops->get_wol) return -EOPNOTSUPP; @@ -231,7 +231,7 @@ static int ethtool_get_msglevel(struct net_device *dev, char __user *useraddr) { - struct ethtool_value edata = { ETHTOOL_GMSGLVL }; + struct ethtool_value edata = { .cmd = ETHTOOL_GMSGLVL }; if (!dev->ethtool_ops->get_msglevel) return -EOPNOTSUPP; @@ -267,7 +267,7 @@ static int ethtool_get_link(struct net_device *dev, void __user *useraddr) { - struct ethtool_value edata = { ETHTOOL_GLINK }; + struct ethtool_value edata = { .cmd = ETHTOOL_GLINK }; if (!dev->ethtool_ops->get_link) return -EOPNOTSUPP; @@ -367,7 +367,7 @@ static int ethtool_get_coalesce(struct net_device *dev, void __user *useraddr) { - struct ethtool_coalesce coalesce = { ETHTOOL_GCOALESCE }; + struct ethtool_coalesce coalesce = { .cmd = ETHTOOL_GCOALESCE }; if (!dev->ethtool_ops->get_coalesce) return -EOPNOTSUPP; @@ -394,7 +394,7 @@ static int ethtool_get_ringparam(struct net_device *dev, void __user *useraddr) { - struct ethtool_ringparam ringparam = { ETHTOOL_GRINGPARAM }; + struct ethtool_ringparam ringparam = { .cmd = ETHTOOL_GRINGPARAM }; if (!dev->ethtool_ops->get_ringparam) return -EOPNOTSUPP; @@ -421,7 +421,7 @@ static int ethtool_get_pauseparam(struct net_device *dev, void __user *useraddr) { - struct ethtool_pauseparam pauseparam = { ETHTOOL_GPAUSEPARAM }; + struct ethtool_pauseparam pauseparam = { .cmd = ETHTOOL_GPAUSEPARAM }; if (!dev->ethtool_ops->get_pauseparam) return -EOPNOTSUPP; @@ -448,7 +448,7 @@ static int ethtool_get_rx_csum(struct net_device *dev, char __user *useraddr) { - struct ethtool_value edata = { ETHTOOL_GRXCSUM }; + struct ethtool_value edata = { .cmd = ETHTOOL_GRXCSUM }; if (!dev->ethtool_ops->get_rx_csum) return -EOPNOTSUPP; @@ -476,7 +476,7 @@ static int ethtool_get_tx_csum(struct net_device *dev, char __user *useraddr) { - struct ethtool_value edata = { ETHTOOL_GTXCSUM }; + struct ethtool_value edata = { .cmd = ETHTOOL_GTXCSUM }; if (!dev->ethtool_ops->get_tx_csum) return -EOPNOTSUPP; @@ -528,7 +528,7 @@ static int ethtool_get_sg(struct net_device *dev, char __user *useraddr) { - struct ethtool_value edata = { ETHTOOL_GSG }; + struct ethtool_value edata = { .cmd = ETHTOOL_GSG }; if (!dev->ethtool_ops->get_sg) return -EOPNOTSUPP; @@ -559,7 +559,7 @@ static int ethtool_get_tso(struct net_device *dev, char __user *useraddr) { - struct ethtool_value edata = { ETHTOOL_GTSO }; + struct ethtool_value edata = { .cmd = ETHTOOL_GTSO }; if (!dev->ethtool_ops->get_tso) return -EOPNOTSUPP; @@ -589,7 +589,7 @@ static int ethtool_get_ufo(struct net_device *dev, char __user *useraddr) { - struct ethtool_value edata = { ETHTOOL_GUFO }; + struct ethtool_value edata = { .cmd = ETHTOOL_GUFO }; if (!dev->ethtool_ops->get_ufo) return -EOPNOTSUPP; @@ -616,7 +616,7 @@ static int ethtool_get_gso(struct net_device *dev, char __user *useraddr) { - struct ethtool_value edata = { ETHTOOL_GGSO }; + struct ethtool_value edata = { .cmd = ETHTOOL_GGSO }; edata.data = dev->features & NETIF_F_GSO; if (copy_to_user(useraddr, &edata, sizeof(edata)))