Author: adrian
Date: Mon Feb 6 05:09:42 2017
New Revision: 313317
URL: https://svnweb.freebsd.org/changeset/base/313317
Log:
[iwm] Change 2nd arg of iwm_phy_db_set_section() to struct iwm_rx_packet.
* This matches the function declaration in Linux's iwlwifi.
Obtained from: DragonflyBSD commit
de7995a5e0ebf2d0016a87a0142a98c75db58fb4
Modified:
head/sys/dev/iwm/if_iwm.c
head/sys/dev/iwm/if_iwm_phy_db.c
head/sys/dev/iwm/if_iwm_phy_db.h
Modified: head/sys/dev/iwm/if_iwm.c
==============================================================================
--- head/sys/dev/iwm/if_iwm.c Mon Feb 6 05:08:21 2017 (r313316)
+++ head/sys/dev/iwm/if_iwm.c Mon Feb 6 05:09:42 2017 (r313317)
@@ -5383,13 +5383,9 @@ iwm_notif_intr(struct iwm_softc *sc)
wakeup(&sc->sc_uc);
break; }
- case IWM_CALIB_RES_NOTIF_PHY_DB: {
- struct iwm_calib_res_notif_phy_db *phy_db_notif;
- phy_db_notif = (void *)pkt->data;
-
- iwm_phy_db_set_section(sc->sc_phy_db, phy_db_notif);
-
- break; }
+ case IWM_CALIB_RES_NOTIF_PHY_DB:
+ iwm_phy_db_set_section(sc->sc_phy_db, pkt);
+ break;
case IWM_STATISTICS_NOTIFICATION: {
struct iwm_notif_statistics *stats;
Modified: head/sys/dev/iwm/if_iwm_phy_db.c
==============================================================================
--- head/sys/dev/iwm/if_iwm_phy_db.c Mon Feb 6 05:08:21 2017
(r313316)
+++ head/sys/dev/iwm/if_iwm_phy_db.c Mon Feb 6 05:09:42 2017
(r313317)
@@ -310,8 +310,10 @@ iwm_phy_db_free(struct iwm_phy_db *phy_d
int
iwm_phy_db_set_section(struct iwm_phy_db *phy_db,
- struct iwm_calib_res_notif_phy_db *phy_db_notif)
+ struct iwm_rx_packet *pkt)
{
+ struct iwm_calib_res_notif_phy_db *phy_db_notif =
+ (struct iwm_calib_res_notif_phy_db *)pkt->data;
enum iwm_phy_db_section_type type = le16toh(phy_db_notif->type);
uint16_t size = le16toh(phy_db_notif->length);
struct iwm_phy_db_entry *entry;
Modified: head/sys/dev/iwm/if_iwm_phy_db.h
==============================================================================
--- head/sys/dev/iwm/if_iwm_phy_db.h Mon Feb 6 05:08:21 2017
(r313316)
+++ head/sys/dev/iwm/if_iwm_phy_db.h Mon Feb 6 05:09:42 2017
(r313317)
@@ -111,7 +111,7 @@ struct iwm_calib_res_notif_phy_db;
extern struct iwm_phy_db *iwm_phy_db_init(struct iwm_softc *sc);
extern void iwm_phy_db_free(struct iwm_phy_db *phy_db);
extern int iwm_phy_db_set_section(struct iwm_phy_db *phy_db,
- struct iwm_calib_res_notif_phy_db *phy_db_notif);
+ struct iwm_rx_packet *pkt);
extern int iwm_send_phy_db_data(struct iwm_phy_db *phy_db);
#endif /* __IF_IWM_PHY_DB_H__ */
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
