diff --git a/[refs] b/[refs] index 8b1c721efdcc..0bfb309a20df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd601cc464e1ddc041d07ba2e4c015cdb9e392ec +refs/heads/master: 975419cf01fc6997879196d1c8f5ebffd30d3b20 diff --git a/trunk/drivers/net/ethernet/brocade/bna/bnad_ethtool.c b/trunk/drivers/net/ethernet/brocade/bna/bnad_ethtool.c index 5f7be5ac32a1..9b44ec8096ba 100644 --- a/trunk/drivers/net/ethernet/brocade/bna/bnad_ethtool.c +++ b/trunk/drivers/net/ethernet/brocade/bna/bnad_ethtool.c @@ -38,7 +38,7 @@ sizeof(struct bnad_drv_stats) / sizeof(u64) + \ offsetof(struct bfi_enet_stats, rxf_stats[0]) / sizeof(u64)) -static char *bnad_net_stats_strings[BNAD_ETHTOOL_STATS_NUM] = { +static const char *bnad_net_stats_strings[BNAD_ETHTOOL_STATS_NUM] = { "rx_packets", "tx_packets", "rx_bytes", @@ -1072,7 +1072,7 @@ bnad_set_eeprom(struct net_device *netdev, struct ethtool_eeprom *eeprom, return ret; } -static struct ethtool_ops bnad_ethtool_ops = { +static const struct ethtool_ops bnad_ethtool_ops = { .get_settings = bnad_get_settings, .set_settings = bnad_set_settings, .get_drvinfo = bnad_get_drvinfo,