KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ledtrig-netdev: use dev_get_stats to get statistics on kernels >=2.6.30

Browse source 
Fixes a possible NULL pointer dereference.

SVN-Revision: 18925
This commit is contained in:
Gabor Juhos 2009-12-25 10:06:22 +00:00
parent 0a24ec2e4a
commit cd2416e6ea
3 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
target/linux/generic-2.6/files-2.6.30/drivers/leds/ledtrig-netdev.c
View file

@ -307,7 +307,7 @@ done:
static void netdev_trig_timer(unsigned long arg) static void netdev_trig_timer(unsigned long arg)
{ {
struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg; struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg;
struct net_device_stats *dev_stats; const struct net_device_stats *dev_stats;
unsigned new_activity; unsigned new_activity;
write_lock(&trigger_data->lock); write_lock(&trigger_data->lock);
@ -317,11 +317,8 @@ static void netdev_trig_timer(unsigned long arg)
led_set_brightness(trigger_data->led_cdev, ((trigger_data->mode & MODE_LINK) != 0 && trigger_data->link_up) ? LED_FULL : LED_OFF); led_set_brightness(trigger_data->led_cdev, ((trigger_data->mode & MODE_LINK) != 0 && trigger_data->link_up) ? LED_FULL : LED_OFF);
goto no_restart; goto no_restart;
} }
#ifdef CONFIG_COMPAT_NET_DEV_OPS
dev_stats = trigger_data->net_dev->get_stats(trigger_data->net_dev); dev_stats = dev_get_stats(trigger_data->net_dev);
#else
dev_stats = trigger_data->net_dev->netdev_ops->ndo_get_stats(trigger_data->net_dev);
#endif
new_activity = new_activity =
((trigger_data->mode & MODE_TX) ? dev_stats->tx_packets : 0) + ((trigger_data->mode & MODE_TX) ? dev_stats->tx_packets : 0) +
((trigger_data->mode & MODE_RX) ? dev_stats->rx_packets : 0); ((trigger_data->mode & MODE_RX) ? dev_stats->rx_packets : 0);

9
target/linux/generic-2.6/files-2.6.31/drivers/leds/ledtrig-netdev.c
View file

@ -307,7 +307,7 @@ done:
static void netdev_trig_timer(unsigned long arg) static void netdev_trig_timer(unsigned long arg)
{ {
struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg; struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg;
struct net_device_stats *dev_stats; const struct net_device_stats *dev_stats;
unsigned new_activity; unsigned new_activity;
write_lock(&trigger_data->lock); write_lock(&trigger_data->lock);
@ -317,11 +317,8 @@ static void netdev_trig_timer(unsigned long arg)
led_set_brightness(trigger_data->led_cdev, ((trigger_data->mode & MODE_LINK) != 0 && trigger_data->link_up) ? LED_FULL : LED_OFF); led_set_brightness(trigger_data->led_cdev, ((trigger_data->mode & MODE_LINK) != 0 && trigger_data->link_up) ? LED_FULL : LED_OFF);
goto no_restart; goto no_restart;
} }
#ifdef CONFIG_COMPAT_NET_DEV_OPS
dev_stats = trigger_data->net_dev->get_stats(trigger_data->net_dev); dev_stats = dev_get_stats(trigger_data->net_dev);
#else
dev_stats = trigger_data->net_dev->netdev_ops->ndo_get_stats(trigger_data->net_dev);
#endif
new_activity = new_activity =
((trigger_data->mode & MODE_TX) ? dev_stats->tx_packets : 0) + ((trigger_data->mode & MODE_TX) ? dev_stats->tx_packets : 0) +
((trigger_data->mode & MODE_RX) ? dev_stats->rx_packets : 0); ((trigger_data->mode & MODE_RX) ? dev_stats->rx_packets : 0);

9
target/linux/generic-2.6/files-2.6.32/drivers/leds/ledtrig-netdev.c
View file

@ -307,7 +307,7 @@ done:
static void netdev_trig_timer(unsigned long arg) static void netdev_trig_timer(unsigned long arg)
{ {
struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg; struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg;
struct net_device_stats *dev_stats; const struct net_device_stats *dev_stats;
unsigned new_activity; unsigned new_activity;
write_lock(&trigger_data->lock); write_lock(&trigger_data->lock);
@ -317,11 +317,8 @@ static void netdev_trig_timer(unsigned long arg)
led_set_brightness(trigger_data->led_cdev, ((trigger_data->mode & MODE_LINK) != 0 && trigger_data->link_up) ? LED_FULL : LED_OFF); led_set_brightness(trigger_data->led_cdev, ((trigger_data->mode & MODE_LINK) != 0 && trigger_data->link_up) ? LED_FULL : LED_OFF);
goto no_restart; goto no_restart;
} }
#ifdef CONFIG_COMPAT_NET_DEV_OPS
dev_stats = trigger_data->net_dev->get_stats(trigger_data->net_dev); dev_stats = dev_get_stats(trigger_data->net_dev);
#else
dev_stats = trigger_data->net_dev->netdev_ops->ndo_get_stats(trigger_data->net_dev);
#endif
new_activity = new_activity =
((trigger_data->mode & MODE_TX) ? dev_stats->tx_packets : 0) + ((trigger_data->mode & MODE_TX) ? dev_stats->tx_packets : 0) +
((trigger_data->mode & MODE_RX) ? dev_stats->rx_packets : 0); ((trigger_data->mode & MODE_RX) ? dev_stats->rx_packets : 0);