From: Vladimir Sokolovsky Date: Mon, 24 Nov 2014 16:17:54 +0000 (+0200) Subject: mlx4_en: Fixed typo in the backport X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=dba2cadf4af01f678a89c35b2251acf69d6f0058;p=~emulex%2Fcompat-rdma.git mlx4_en: Fixed typo in the backport Signed-off-by: Vladimir Sokolovsky --- diff --git a/patches/0003-BACKPORT-mlx4-core-and-en.patch b/patches/0003-BACKPORT-mlx4-core-and-en.patch index cd76edc..612ea70 100644 --- a/patches/0003-BACKPORT-mlx4-core-and-en.patch +++ b/patches/0003-BACKPORT-mlx4-core-and-en.patch @@ -7,13 +7,13 @@ Signed-off-by: Vladimir Sokolovsky drivers/net/ethernet/mellanox/mlx4/en_clock.c | 2 + drivers/net/ethernet/mellanox/mlx4/en_cq.c | 5 ++ drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 9 ++++- - drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 26 ++++++++++++ - drivers/net/ethernet/mellanox/mlx4/en_rx.c | 48 ++++++++++++++++++++++- - drivers/net/ethernet/mellanox/mlx4/en_tx.c | 35 ++++++++++++++++- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 26 +++++++++++++ + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 46 ++++++++++++++++++++++- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 35 +++++++++++++++++- drivers/net/ethernet/mellanox/mlx4/eq.c | 10 +++++ - drivers/net/ethernet/mellanox/mlx4/main.c | 24 +++++++++++ + drivers/net/ethernet/mellanox/mlx4/main.c | 24 ++++++++++++ drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 4 ++ - 10 files changed, 165 insertions(+), 4 deletions(-) + 10 files changed, 164 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c index xxxxxxx..xxxxxxx xxxxxx @@ -301,16 +301,14 @@ index xxxxxxx..xxxxxxx xxxxxx /* Move relevant fragments to skb */ used_frags = mlx4_en_complete_rx_desc(priv, rx_desc, frags, -@@ -599,7 +602,8 @@ static struct sk_buff *mlx4_en_rx_skb(struct mlx4_en_priv *priv, +@@ -599,6 +602,7 @@ static struct sk_buff *mlx4_en_rx_skb(struct mlx4_en_priv *priv, } skb_shinfo(skb)->nr_frags = used_frags; -- pull_len = eth_get_headlen(va, SMALL_PACKET_SIZE); +#ifdef HAVE_ETH_GET_HEADLEN -+ pull_len = eth_get_headlen(va, SMALLl_PACKET_SIZE); + pull_len = eth_get_headlen(va, SMALL_PACKET_SIZE); /* Copy headers into the skb linear buffer */ memcpy(skb->data, va, pull_len); - skb->tail += pull_len; @@ -610,6 +614,17 @@ static struct sk_buff *mlx4_en_rx_skb(struct mlx4_en_priv *priv, /* Adjust size of first fragment */ skb_frag_size_sub(&skb_shinfo(skb)->frags[0], pull_len);