diff options
| author | Matthew Vick <matthew.vick@intel.com> | 2012-12-13 07:20:36 +0000 | 
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2013-01-18 06:52:22 -0800 | 
| commit | ba59814b39b7ec674f604b0f9b35f1773f2fbf1a (patch) | |
| tree | dc9a5126db710cbfa0cada18f20acec42495b7b7 | |
| parent | badc26dd648cb3017affb834e9f79995e3911335 (diff) | |
| download | olio-linux-3.10-ba59814b39b7ec674f604b0f9b35f1773f2fbf1a.tar.xz olio-linux-3.10-ba59814b39b7ec674f604b0f9b35f1773f2fbf1a.zip  | |
igb: Use in-kernel PTP_EV_PORT #define
Rather than use an extra #define for something that already exists, use the
kernel #define for the PTP port.
Cc: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: Matthew Vick <matthew.vick@intel.com>
Acked-by: Jacob Keller <Jacob.e.keller@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| -rw-r--r-- | drivers/net/ethernet/intel/igb/igb_ptp.c | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_ptp.c b/drivers/net/ethernet/intel/igb/igb_ptp.c index 09f61a4a951..0987822359f 100644 --- a/drivers/net/ethernet/intel/igb/igb_ptp.c +++ b/drivers/net/ethernet/intel/igb/igb_ptp.c @@ -20,6 +20,7 @@  #include <linux/module.h>  #include <linux/device.h>  #include <linux/pci.h> +#include <linux/ptp_classify.h>  #include "igb.h" @@ -698,7 +699,6 @@ int igb_ptp_hwtstamp_ioctl(struct net_device *netdev,  	else  		wr32(E1000_ETQF(3), 0); -#define PTP_PORT 319  	/* L4 Queue Filter[3]: filter by destination port and protocol */  	if (is_l4) {  		u32 ftqf = (IPPROTO_UDP /* UDP */ @@ -707,12 +707,12 @@ int igb_ptp_hwtstamp_ioctl(struct net_device *netdev,  			| E1000_FTQF_MASK); /* mask all inputs */  		ftqf &= ~E1000_FTQF_MASK_PROTO_BP; /* enable protocol check */ -		wr32(E1000_IMIR(3), htons(PTP_PORT)); +		wr32(E1000_IMIR(3), htons(PTP_EV_PORT));  		wr32(E1000_IMIREXT(3),  		     (E1000_IMIREXT_SIZE_BP | E1000_IMIREXT_CTRL_BP));  		if (hw->mac.type == e1000_82576) {  			/* enable source port check */ -			wr32(E1000_SPQF(3), htons(PTP_PORT)); +			wr32(E1000_SPQF(3), htons(PTP_EV_PORT));  			ftqf &= ~E1000_FTQF_MASK_SOURCE_PORT_BP;  		}  		wr32(E1000_FTQF(3), ftqf);  |