From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 28 Sep 2012 01:10:43 +0000 (+1000)
Subject: Merge remote-tracking branch 'infiniband/for-next'
X-Git-Tag: next-20120928~80
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4ae3c93b4e7df7a90e118898dd5c7dcdd163f820;p=karo-tx-linux.git

Merge remote-tracking branch 'infiniband/for-next'

Conflicts:
	drivers/net/ethernet/mellanox/mlx4/mlx4.h
---

4ae3c93b4e7df7a90e118898dd5c7dcdd163f820
diff --cc drivers/net/ethernet/mellanox/mlx4/mlx4.h
index dba69d98734a,f7156b7198a1..1cf42036d7bb
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
@@@ -690,82 -692,11 +692,87 @@@ struct mlx4_steer 
  	struct list_head steer_entries[MLX4_NUM_STEERS];
  };
  
 +struct mlx4_net_trans_rule_hw_ctrl {
 +	__be32 ctrl;
 +	__be32 vf_vep_port;
 +	__be32 qpn;
 +	__be32 reserved;
 +};
 +
 +struct mlx4_net_trans_rule_hw_ib {
 +	u8 size;
 +	u8 rsvd1;
 +	__be16 id;
 +	u32 rsvd2;
 +	__be32 qpn;
 +	__be32 qpn_mask;
 +	u8 dst_gid[16];
 +	u8 dst_gid_msk[16];
 +} __packed;
 +
 +struct mlx4_net_trans_rule_hw_eth {
 +	u8	size;
 +	u8	rsvd;
 +	__be16	id;
 +	u8	rsvd1[6];
 +	u8	dst_mac[6];
 +	u16	rsvd2;
 +	u8	dst_mac_msk[6];
 +	u16	rsvd3;
 +	u8	src_mac[6];
 +	u16	rsvd4;
 +	u8	src_mac_msk[6];
 +	u8      rsvd5;
 +	u8      ether_type_enable;
 +	__be16  ether_type;
 +	__be16  vlan_id_msk;
 +	__be16  vlan_id;
 +} __packed;
 +
 +struct mlx4_net_trans_rule_hw_tcp_udp {
 +	u8	size;
 +	u8	rsvd;
 +	__be16	id;
 +	__be16	rsvd1[3];
 +	__be16	dst_port;
 +	__be16	rsvd2;
 +	__be16	dst_port_msk;
 +	__be16	rsvd3;
 +	__be16	src_port;
 +	__be16	rsvd4;
 +	__be16	src_port_msk;
 +} __packed;
 +
 +struct mlx4_net_trans_rule_hw_ipv4 {
 +	u8	size;
 +	u8	rsvd;
 +	__be16	id;
 +	__be32	rsvd1;
 +	__be32	dst_ip;
 +	__be32	dst_ip_msk;
 +	__be32	src_ip;
 +	__be32	src_ip_msk;
 +} __packed;
 +
 +struct _rule_hw {
 +	union {
 +		struct {
 +			u8 size;
 +			u8 rsvd;
 +			__be16 id;
 +		};
 +		struct mlx4_net_trans_rule_hw_eth eth;
 +		struct mlx4_net_trans_rule_hw_ib ib;
 +		struct mlx4_net_trans_rule_hw_ipv4 ipv4;
 +		struct mlx4_net_trans_rule_hw_tcp_udp tcp_udp;
 +	};
 +};
 +
+ enum {
+ 	MLX4_PCI_DEV_IS_VF		= 1 << 0,
+ 	MLX4_PCI_DEV_FORCE_SENSE_PORT	= 1 << 1,
+ };
+ 
  struct mlx4_priv {
  	struct mlx4_dev		dev;