run(4): do not remove IEEE80211_FC1_PROTECTED bit from undecrypted frames (untested)

[avos]

Committed in rS345753.

sys/dev/usb/wlan/if_run.c

 
 /* Support functions for SR-IOV/VF management */
 static inline void
 ixgbe_send_vf_msg(struct ixgbe_softc *sc, struct ixgbe_vf *vf, u32 msg)
 {
         if (vf->flags & IXGBE_VF_CTS)
                 msg |= IXGBE_VT_MSGTYPE_CTS;
 
-        sc->hw.mbx.ops.write(&sc->hw, &msg, 1, vf->pool);
+        sc->hw.mbx.ops[0].write(&sc->hw, &msg, 1, vf->pool);
 }
 
 static inline void
 ixgbe_send_vf_ack(struct ixgbe_softc *sc, struct ixgbe_vf *vf, u32 msg)
 {
         msg &= IXGBE_VT_MSG_MASK;
         ixgbe_send_vf_msg(sc, vf, msg | IXGBE_VT_MSGTYPE_SUCCESS);
 }
ixgbe_vf_reset_msg(struct ixgbe_softc *sc, struct ixgbe_vf *vf, uint32_t *msg)
         ixgbe_vf_enable_transmit(sc, vf);
         ixgbe_vf_enable_receive(sc, vf);
 
         vf->flags |= IXGBE_VF_CTS;
 
         resp[0] = IXGBE_VF_RESET | ack | IXGBE_VT_MSGTYPE_CTS;
         bcopy(vf->ether_addr, &resp[1], ETHER_ADDR_LEN);
         resp[3] = hw->mac.mc_filter_type;
-        hw->mbx.ops.write(hw, resp, IXGBE_VF_PERMADDR_MSG_LEN, vf->pool);
+        hw->mbx.ops[0].write(hw, resp, IXGBE_VF_PERMADDR_MSG_LEN, vf->pool);
 } /* ixgbe_vf_reset_msg */
 
 
 static void
 ixgbe_vf_set_mac(struct ixgbe_softc *sc, struct ixgbe_vf *vf, uint32_t *msg)
 {
         uint8_t *mac;
 
resp[0] = IXGBE_VF_GET_QUEUES | IXGBE_VT_MSGTYPE_SUCCESS |
             IXGBE_VT_MSGTYPE_CTS;
 
         num_queues = ixgbe_vf_queues(sc->iov_mode);
         resp[IXGBE_VF_TX_QUEUES] = num_queues;
         resp[IXGBE_VF_RX_QUEUES] = num_queues;
         resp[IXGBE_VF_TRANS_VLAN] = (vf->default_vlan != 0);
         resp[IXGBE_VF_DEF_QUEUE] = 0;
 
-        hw->mbx.ops.write(hw, resp, IXGBE_VF_GET_QUEUES_RESP_LEN, vf->pool);
+        hw->mbx.ops[0].write(hw, resp, IXGBE_VF_GET_QUEUES_RESP_LEN, vf->pool);
 } /* ixgbe_vf_get_queues */
 
 
 static void
 ixgbe_process_vf_msg(if_ctx_t ctx, struct ixgbe_vf *vf)
 {
         struct ixgbe_softc  *sc = iflib_get_softc(ctx);
 #ifdef KTR
         if_t                ifp = iflib_get_ifp(ctx);
 #endif
         struct ixgbe_hw *hw;
         uint32_t msg[IXGBE_VFMAILBOX_SIZE];
         int error;
 
         hw = &sc->hw;
 
-        error = hw->mbx.ops.read(hw, msg, IXGBE_VFMAILBOX_SIZE, vf->pool);
+        error = hw->mbx.ops[0].read(hw, msg, IXGBE_VFMAILBOX_SIZE, vf->pool);
 
         if (error != 0)
                 return;
 
         CTR3(KTR_MALLOC, "%s: received msg %x from %d", if_name(ifp),
             msg[0], vf->pool);
         if (msg[0] == IXGBE_VF_RESET) {
                 ixgbe_vf_reset_msg(sc, vf, msg);
ixgbe_handle_mbx(void *context)
         int i;
 
         hw = &sc->hw;
 
         for (i = 0; i < sc->num_vfs; i++) {
                 vf = &sc->vfs[i];
 
                 if (vf->flags & IXGBE_VF_ACTIVE) {
-                        if (hw->mbx.ops.check_for_rst(hw, vf->pool) == 0)
+                        if (hw->mbx.ops[0].check_for_rst(hw, vf->pool) == 0)
                                 ixgbe_process_vf_reset(sc, vf);
 
-                        if (hw->mbx.ops.check_for_msg(hw, vf->pool) == 0)
+                        if (hw->mbx.ops[0].check_for_msg(hw, vf->pool) == 0)
                                 ixgbe_process_vf_msg(ctx, vf);
 
-                        if (hw->mbx.ops.check_for_ack(hw, vf->pool) == 0)
+                        if (hw->mbx.ops[0].check_for_ack(hw, vf->pool) == 0)
                                 ixgbe_process_vf_ack(sc, vf);
                 }
         }
 } /* ixgbe_handle_mbx */
 
 int
 ixgbe_if_iov_init(if_ctx_t ctx, u16 num_vfs, const nvlist_t *config)
 {