aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-hcmd.c
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2008-05-04 22:22:33 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-05-14 16:29:44 -0400
commitdb11d6343aa14ab61258bfad9178042d4be49333 (patch)
tree410597e12de8951b68b875add1fe3577f240efa3 /drivers/net/wireless/iwlwifi/iwl-hcmd.c
parent8dd266ef4eb51d034fa1c5f9307a9ff07547d8e6 (diff)
iwlwifi: remove 4965 from rx_packet
This patch removes 4965 mark from rx_packet. Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-hcmd.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-hcmd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-hcmd.c b/drivers/net/wireless/iwlwifi/iwl-hcmd.c
index acb5a8abd786..0412adf6ef8b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-hcmd.c
+++ b/drivers/net/wireless/iwlwifi/iwl-hcmd.c
@@ -101,7 +101,7 @@ EXPORT_SYMBOL(get_cmd_string);
101static int iwl_generic_cmd_callback(struct iwl_priv *priv, 101static int iwl_generic_cmd_callback(struct iwl_priv *priv,
102 struct iwl_cmd *cmd, struct sk_buff *skb) 102 struct iwl_cmd *cmd, struct sk_buff *skb)
103{ 103{
104 struct iwl4965_rx_packet *pkt = NULL; 104 struct iwl_rx_packet *pkt = NULL;
105 105
106 if (!skb) { 106 if (!skb) {
107 IWL_ERROR("Error: Response NULL in %s.\n", 107 IWL_ERROR("Error: Response NULL in %s.\n",
@@ -109,7 +109,7 @@ static int iwl_generic_cmd_callback(struct iwl_priv *priv,
109 return 1; 109 return 1;
110 } 110 }
111 111
112 pkt = (struct iwl4965_rx_packet *)skb->data; 112 pkt = (struct iwl_rx_packet *)skb->data;
113 if (pkt->hdr.flags & IWL_CMD_FAILED_MSK) { 113 if (pkt->hdr.flags & IWL_CMD_FAILED_MSK) {
114 IWL_ERROR("Bad return from %s (0x%08X)\n", 114 IWL_ERROR("Bad return from %s (0x%08X)\n",
115 get_cmd_string(cmd->hdr.cmd), pkt->hdr.flags); 115 get_cmd_string(cmd->hdr.cmd), pkt->hdr.flags);