From f741ff78615bd973a1bad6e33b191b0d00e36ea6 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Tue, 2 Oct 2012 01:47:46 +0000 Subject: [PATCH] --- yaml --- r: 330207 b: refs/heads/master c: 786fdf0bbf1c3a1b402bb2da946b93e0b36a8f32 h: refs/heads/master i: 330205: 9b0c8bf89fa83dd697e0cc6c4b447b88862f66af 330203: 6f283ed64c6f1204bc2b74488da794d3d5eab2d7 330199: 43d042d4a8f93beeac279b47a57d4f71b18ce80c 330191: af7154936f410ddb842eb3b1841998f9abe96604 330175: 85c4e9e52b44dd1d8c5c1fbccdebe548e2cc10c4 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9dd9580e9a81..aae2b68f79a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62b54dd91567686a1cb118f76a72d5f4764a86dd +refs/heads/master: 786fdf0bbf1c3a1b402bb2da946b93e0b36a8f32 diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index f7ed122f4071..d5648fc666bd 100644 --- a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c @@ -3052,9 +3052,8 @@ static void bnx2x_drv_info_ether_stat(struct bnx2x *bp) struct eth_stats_info *ether_stat = &bp->slowpath->drv_info_to_mcp.ether_stat; - /* leave last char as NULL */ - memcpy(ether_stat->version, DRV_MODULE_VERSION, - ETH_STAT_INFO_VERSION_LEN - 1); + strlcpy(ether_stat->version, DRV_MODULE_VERSION, + ETH_STAT_INFO_VERSION_LEN); bp->sp_objs[0].mac_obj.get_n_elements(bp, &bp->sp_objs[0].mac_obj, DRV_INFO_ETH_STAT_NUM_MACS_REQUIRED,