From 55bbe6ba1965b0a848fd4035614312990cf8dc3c Mon Sep 17 00:00:00 2001 From: "Huang, Xiong" Date: Tue, 17 Apr 2012 19:32:27 +0000 Subject: [PATCH] --- yaml --- r: 301051 b: refs/heads/master c: f4e5db2bb7596ffbe758632e2128a0d8a9ea34fe h: refs/heads/master i: 301049: 0d6b440944d9692aff7c20a3251d3295ba5b7917 301047: 936f7442bfddc335344a53860be70ebd069cde48 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h | 7 ------- trunk/drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 -- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 7faa4cc12fba..8e764dd3de06 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f1fd0ef65fcf6ee40e6fd3a7f1a4a16bfa9443a +refs/heads/master: f4e5db2bb7596ffbe758632e2128a0d8a9ea34fe diff --git a/trunk/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h b/trunk/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h index 855aca0ec4f7..c22d698cb43f 100644 --- a/trunk/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h +++ b/trunk/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h @@ -669,13 +669,6 @@ int atl1c_phy_power_saving(struct atl1c_hw *hw); #define REG_INT_RETRIG_TIMER 0x1608 #define INT_RETRIG_TIMER_MASK 0xFFFF -#define REG_HDS_CTRL 0x160C -#define HDS_CTRL_EN 0x0001 -#define HDS_CTRL_BACKFILLSIZE_SHIFT 8 -#define HDS_CTRL_BACKFILLSIZE_MASK 0x0FFF -#define HDS_CTRL_MAX_HDRSIZE_SHIFT 20 -#define HDS_CTRL_MAC_HDRSIZE_MASK 0x0FFF - #define REG_MAC_RX_STATUS_BIN 0x1700 #define REG_MAC_RX_STATUS_END 0x175c #define REG_MAC_TX_STATUS_BIN 0x1760 diff --git a/trunk/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/trunk/drivers/net/ethernet/atheros/atl1c/atl1c_main.c index a77cd9053c2d..4f19f5c30fc7 100644 --- a/trunk/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/trunk/drivers/net/ethernet/atheros/atl1c/atl1c_main.c @@ -1453,8 +1453,6 @@ static int atl1c_configure(struct atl1c_adapter *adapter) /* set MTU */ AT_WRITE_REG(hw, REG_MTU, hw->max_frame_size + ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN); - /* HDS, disable */ - AT_WRITE_REG(hw, REG_HDS_CTRL, 0); atl1c_configure_tx(adapter); atl1c_configure_rx(adapter);