Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73d540f2 authored by Sathya Perla's avatar Sathya Perla Committed by David S. Miller
Browse files

be2net: fix promiscuous and multicast promiscuous modes being enabled always 



Signed-off-by: default avatarSathya Perla <sathyap@serverengines.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8f7e524c

drivers/net/benet/be_cmds.c

+4 −4
Original line number Diff line number Diff line
@@ -729,8 +729,8 @@ int be_cmd_q_destroy(struct be_adapter *adapter, struct be_queue_info *q, 
/* Create an rx filtering policy configuration on an i/f

 * Uses mbox

 */

int be_cmd_if_create(struct be_adapter *adapter, u32 flags, u8 *mac,

		bool pmac_invalid, u32 *if_handle, u32 *pmac_id)

int be_cmd_if_create(struct be_adapter *adapter, u32 cap_flags, u32 en_flags,

		u8 *mac, bool pmac_invalid, u32 *if_handle, u32 *pmac_id)

{

	struct be_mcc_wrb *wrb;

	struct be_cmd_req_if_create *req;
@@ -746,8 +746,8 @@ int be_cmd_if_create(struct be_adapter *adapter, u32 flags, u8 *mac, 
	be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,

		OPCODE_COMMON_NTWK_INTERFACE_CREATE, sizeof(*req));



	req->capability_flags = cpu_to_le32(flags);

	req->enable_flags = cpu_to_le32(flags);

	req->capability_flags = cpu_to_le32(cap_flags);

	req->enable_flags = cpu_to_le32(en_flags);

	req->pmac_invalid = pmac_invalid;

	if (!pmac_invalid)

		memcpy(req->mac_addr, mac, ETH_ALEN);

drivers/net/benet/be_cmds.h

+3 −2
Original line number Diff line number Diff line
@@ -720,8 +720,9 @@ extern int be_cmd_mac_addr_query(struct be_adapter *adapter, u8 *mac_addr, 
extern int be_cmd_pmac_add(struct be_adapter *adapter, u8 *mac_addr,

			u32 if_id, u32 *pmac_id);

extern int be_cmd_pmac_del(struct be_adapter *adapter, u32 if_id, u32 pmac_id);

extern int be_cmd_if_create(struct be_adapter *adapter, u32 if_flags, u8 *mac,

			bool pmac_invalid, u32 *if_handle, u32 *pmac_id);

extern int be_cmd_if_create(struct be_adapter *adapter, u32 cap_flags,

			u32 en_flags, u8 *mac, bool pmac_invalid,

			u32 *if_handle, u32 *pmac_id);

extern int be_cmd_if_destroy(struct be_adapter *adapter, u32 if_handle);

extern int be_cmd_eq_create(struct be_adapter *adapter,

			struct be_queue_info *eq, int eq_delay);

drivers/net/benet/be_main.c

+11 −8
Original line number Diff line number Diff line
@@ -1620,19 +1620,22 @@ static int be_open(struct net_device *netdev) 
static int be_setup(struct be_adapter *adapter)

{

	struct net_device *netdev = adapter->netdev;

	u32 if_flags;

	u32 cap_flags, en_flags;

	int status;



	if_flags = BE_IF_FLAGS_BROADCAST | BE_IF_FLAGS_PROMISCUOUS |

		BE_IF_FLAGS_MCAST_PROMISCUOUS | BE_IF_FLAGS_UNTAGGED |

	cap_flags = BE_IF_FLAGS_UNTAGGED | BE_IF_FLAGS_BROADCAST |

			BE_IF_FLAGS_MCAST_PROMISCUOUS |

			BE_IF_FLAGS_PROMISCUOUS |

			BE_IF_FLAGS_PASS_L3L4_ERRORS;

	status = be_cmd_if_create(adapter, if_flags, netdev->dev_addr,

			false/* pmac_invalid */, &adapter->if_handle,

			&adapter->pmac_id);

	en_flags = BE_IF_FLAGS_UNTAGGED | BE_IF_FLAGS_BROADCAST |

			BE_IF_FLAGS_PASS_L3L4_ERRORS;



	status = be_cmd_if_create(adapter, cap_flags, en_flags,

			netdev->dev_addr, false/* pmac_invalid */,

			&adapter->if_handle, &adapter->pmac_id);

	if (status != 0)

		goto do_none;





	status = be_tx_queues_create(adapter);

	if (status != 0)

		goto if_destroy;