LinuxKPI: Add pci_match_id to linux/pci.h

[wulf]

Summary

It finds out if a given PCI device matches a given pci_id table.

Sponsored by: Serenity Cyber Security, LLC
MFC after: 1 week

sys/compat/linuxkpi/common/include/linux/pci.h

tcp_http_log_req_info(struct tcpcb *tp, struct http_sendfile_track *http,
     uint16_t slot, uint8_t val, uint64_t offset, uint64_t nbytes)
 {
         if (tcp_bblogging_on(tp)) {
                 union tcp_log_stackspecific log;
                 struct timeval tv;
 
                 memset(&log.u_bbr, 0, sizeof(log.u_bbr));
 #ifdef TCPHPTS
-                log.u_bbr.inhpts = tcp_in_hpts(tptoinpcb(tp));
+                log.u_bbr.inhpts = tcp_in_hpts(tp);
 #endif
                 log.u_bbr.flex8 = val;
                 log.u_bbr.rttProp = http->timestamp;
                 log.u_bbr.delRate = http->start;
                 log.u_bbr.cur_del_rate = http->end;
                 log.u_bbr.flex1 = http->start_seq;
                 log.u_bbr.flex2 = http->end_seq;
                 log.u_bbr.flex3 = http->flags;
l = tcp_log_event(tp, NULL,
                         TCP_LOG_SOCKET_OPT,
                         err, 0, NULL, 1,
                         NULL, NULL, 0, NULL);
                 if (l) {
                         l->tlb_flex1 = option_num;
                         l->tlb_flex2 = option_val;
                 }
         }
+}
+
+uint32_t
+tcp_get_srtt(struct tcpcb *tp, int granularity)
+{
+        uint32_t srtt;
+
+        if (tp->t_tmr_granularity == TCP_TMR_GRANULARITY_USEC)
+                srtt = tp->t_srtt;
+        else if (tp->t_tmr_granularity == TCP_TMR_GRANULARITY_TICKS)
+                srtt = tp->t_srtt >> TCP_RTT_SHIFT;
+        if (tp->t_tmr_granularity == granularity)
+                return (srtt);
+        /* If we reach here they are oppsite what the caller wants */
+        if (granularity == TCP_TMR_GRANULARITY_USEC) {
+                /*
+                 * The user wants useconds and internally
+                 * its kept in ticks, convert to useconds.
+                 */
+                srtt =  TICKS_2_USEC(srtt);
+        } else if (granularity == TCP_TMR_GRANULARITY_TICKS) {
+                /*
+                 * The user wants ticks and internally its
+                 * kept in useconds, convert to ticks.
+                 */
+                srtt = USEC_2_TICKS(srtt);
+        }
+        return (srtt);
 }