hxge: update driver to 1.3.4

Orabug: 14134149
Signed-off-by: Maxim Uvarov <maxim.uvarov@oracle.com>

diff --git a/drivers/net/hxge/hxge_main.c b/drivers/net/hxge/hxge_main.c
index 65a58ddab754bce322cc063dc5a569163eb65670..5185cb658797051971e484476f7a9d975fbe7133 100644 (file)
--- a/drivers/net/hxge/hxge_main.c
+++ b/drivers/net/hxge/hxge_main.c
@@ -31,7 +31,7 @@ static const char hxge_driver_string[] = "Sun Microsystems(R) 10 Gigabit  Networ
 #else
 #define DRIVERNAPI "-NAPI"
 #endif
-#define DRV_VERSION "1.3.3"
+#define DRV_VERSION "1.3.4"
 const char hxge_driver_version[] = DRV_VERSION;
 static const char hxge_copyright[] = "Copyright (c) 2009, 2011 Oracle America.";
 

diff --git a/drivers/net/hxge/hxge_txdma.c b/drivers/net/hxge/hxge_txdma.c
index 7070f013db5e8892cf3c74bf3d7aafbd24dc0308..1d76b980754e34f35ed986b32add37833428a6cb 100644 (file)
--- a/drivers/net/hxge/hxge_txdma.c
+++ b/drivers/net/hxge/hxge_txdma.c
@@ -1479,9 +1479,9 @@ int hxge_tx_ring(struct sk_buff *skb, struct net_device *netdev)
                        {
                                char fn[25];
                                if (ret == COPY_DESC_FAILED)
-                                       strcpy(fn, "copy_skbdata_to_descs");
+                                       strncpy(fn, "copy_skbdata_to_descs",21);
                                else
-                                       strcpy(fn, "map_skbdata_to_descs");
+                                       strncpy(fn, "map_skbdata_to_descs",20);
                                        
                                HXGE_ERR(hxgep, "%s failed", fn);
                                FREE_SKB(skb);
@@ -2079,7 +2079,6 @@ static tdc_stat_t process_tx_status(struct hxge_ldv *ldvp, int ldf0, int ldf1)
                        stats->oerrors++;
                }
 
-               BUG();
                /* Update discarded-packets counts from Hydra's counters */
                update_tx_err_stats(handle, tx_ring);