提交 73b9da90 编写于 作者: J Junxin Chen 提交者: Yang Yingliang

net: fix bug and change version to 1.9.33.0

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

----------------------------------

This patch fixes bug for hns3_cae_pkt and change version to 1.9.33.0
Signed-off-by: NJunxin Chen <chenjunxin1@huawei.com>
Reviewed-by: NZhaohui Zhong <zhongzhaohui@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 c0162fc3
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/types.h> #include <linux/types.h>
#define HNAE3_MOD_VERSION "1.9.32.0" #define HNAE3_MOD_VERSION "1.9.33.0"
#define HNAE3_MIN_VECTOR_NUM 2 /* one for msi-x, another for IO */ #define HNAE3_MIN_VECTOR_NUM 2 /* one for msi-x, another for IO */
......
...@@ -418,6 +418,7 @@ void __fill_the_pkt_head(struct net_device *netdev, u8 *payload, ...@@ -418,6 +418,7 @@ void __fill_the_pkt_head(struct net_device *netdev, u8 *payload,
dev_err(&netdev->dev, dev_err(&netdev->dev,
"pkt_len(=%d) of ipv4 trace route pkt must big than %d.\n", "pkt_len(=%d) of ipv4 trace route pkt must big than %d.\n",
in_info->pkt_len, IPV4_TRACEROUTE_PKT_LEN); in_info->pkt_len, IPV4_TRACEROUTE_PKT_LEN);
kfree(pkt_payload);
return; return;
} }
...@@ -436,6 +437,7 @@ void __fill_the_pkt_head(struct net_device *netdev, u8 *payload, ...@@ -436,6 +437,7 @@ void __fill_the_pkt_head(struct net_device *netdev, u8 *payload,
dev_err(&netdev->dev, dev_err(&netdev->dev,
"pkt_len(=%d) of ipv6 extension pkt must big than %d.\n", "pkt_len(=%d) of ipv6 extension pkt must big than %d.\n",
in_info->pkt_len, IPV6_EXTENSION_PKT_LEN); in_info->pkt_len, IPV6_EXTENSION_PKT_LEN);
kfree(pkt_payload);
return; return;
} }
memcpy(payload, in_info->dst_mac, ETH_ALEN); memcpy(payload, in_info->dst_mac, ETH_ALEN);
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#ifndef __HNS3_CAE_VERSION_H__ #ifndef __HNS3_CAE_VERSION_H__
#define __HNS3_CAE_VERSION_H__ #define __HNS3_CAE_VERSION_H__
#define HNS3_CAE_MOD_VERSION "1.9.32.0" #define HNS3_CAE_MOD_VERSION "1.9.33.0"
#define CMT_ID_LEN 8 #define CMT_ID_LEN 8
#define RESV_LEN 3 #define RESV_LEN 3
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include "hnae3.h" #include "hnae3.h"
#define HNS3_MOD_VERSION "1.9.32.0" #define HNS3_MOD_VERSION "1.9.33.0"
extern char hns3_driver_version[]; extern char hns3_driver_version[];
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include "hclge_cmd.h" #include "hclge_cmd.h"
#include "hnae3.h" #include "hnae3.h"
#define HCLGE_MOD_VERSION "1.9.32.0" #define HCLGE_MOD_VERSION "1.9.33.0"
#define HCLGE_DRIVER_NAME "hclge" #define HCLGE_DRIVER_NAME "hclge"
#define HCLGE_MAX_PF_NUM 8 #define HCLGE_MAX_PF_NUM 8
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include "hclgevf_cmd.h" #include "hclgevf_cmd.h"
#include "hnae3.h" #include "hnae3.h"
#define HCLGEVF_MOD_VERSION "1.9.32.0" #define HCLGEVF_MOD_VERSION "1.9.33.0"
#define HCLGEVF_DRIVER_NAME "hclgevf" #define HCLGEVF_DRIVER_NAME "hclgevf"
#define HCLGEVF_MAX_VLAN_ID 4095 #define HCLGEVF_MAX_VLAN_ID 4095
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册