maemo.org - Talk - [Announce] kernel-plus for Harmattan

maemo.org - Talk (https://talk.maemo.org/index.php)

- MeeGo / Harmattan (https://talk.maemo.org/forumdisplay.php?f=45)

- - [Announce] kernel-plus for Harmattan (https://talk.maemo.org/showthread.php?t=86543)

Re: [Announce] kernel-plus for Harmattan

One step closer to perfect :)
http://www.spinics.net/lists/linux-w.../msg78413.html

Code:

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c

index 692a275..fc652c4 100644

--- a/drivers/net/wireless/wl12xx/main.c

+++ b/drivers/net/wireless/wl12xx/main.c

@@ -1517,11 +1517,14 @@ static void wl1271_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)

         struct wl1271 *wl = hw->priv;

         struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

         struct ieee80211_vif *vif = info->control.vif;

-        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);

+        struct wl12xx_vif *wlvif = NULL;

         unsigned long flags;

         int q, mapping;

         u8 hlid;

 

+        if (vif)

+                wlvif = wl12xx_vif_to_data(vif);

+

         mapping = skb_get_queue_mapping(skb);

         q = wl1271_tx_get_queue(mapping);

 

@@ -1531,7 +1534,7 @@ static void wl1271_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)

 

         /* queue the packet */

         if (hlid == WL12XX_INVALID_LINK_ID ||

-            !test_bit(hlid, wlvif->links_map)) {

+            (wlvif && !test_bit(hlid, wlvif->links_map))) {

                 wl1271_debug(DEBUG_TX, "DROP skb hlid %d q %d", hlid, q);

                 dev_kfree_skb(skb);

                 goto out;

Code:

diff --git a/drivers/net/wireless/wl12xx/tx.c b/drivers/net/wireless/wl12xx/tx.c

index 02d606f..33b800d 100644

--- a/drivers/net/wireless/wl12xx/tx.c

+++ b/drivers/net/wireless/wl12xx/tx.c

@@ -180,7 +180,7 @@ u8 wl12xx_tx_get_hlid(struct wl1271 *wl, struct wl12xx_vif *wlvif,

 {

         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

 

-        if (wl12xx_is_dummy_packet(wl, skb))

+        if (!wlvif || wl12xx_is_dummy_packet(wl, skb))

                 return wl->system_hlid;

 

         if (wlvif->bss_type == BSS_TYPE_AP_BSS)

@@ -259,7 +259,8 @@ static int wl1271_tx_allocate(struct wl1271 *wl, struct wl12xx_vif *wlvif,

                 ac = wl1271_tx_get_queue(skb_get_queue_mapping(skb));

                 wl->tx_allocated_pkts[ac]++;

 

-                if (!is_dummy && wlvif->bss_type == BSS_TYPE_AP_BSS &&

+                if (!is_dummy && wlvif &&

+                    wlvif->bss_type == BSS_TYPE_AP_BSS &&

                     test_bit(hlid, wlvif->ap.sta_hlid_map))

                         wl->links[hlid].allocated_pkts++;

 

@@ -302,7 +303,7 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct wl12xx_vif *wlvif,

         desc->start_time = cpu_to_le32(hosttime - wl->time_offset);

 

         is_dummy = wl12xx_is_dummy_packet(wl, skb);

-        if (is_dummy || wlvif->bss_type != BSS_TYPE_AP_BSS)

+        if (is_dummy || !wlvif || wlvif->bss_type != BSS_TYPE_AP_BSS)

                 desc->life_time = cpu_to_le16(TX_HW_MGMT_PKT_LIFETIME_TU);

         else

                 desc->life_time = cpu_to_le16(TX_HW_AP_MODE_PKT_LIFETIME_TU);

@@ -321,14 +322,14 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct wl12xx_vif *wlvif,

                            TX_HW_ATTR_SESSION_COUNTER;

 

                 tx_attr |= TX_HW_ATTR_TX_DUMMY_REQ;

-        } else {

+        } else if (wlvif) {

                 /* configure the tx attributes */

                 tx_attr = wlvif->session_counter <<

                           TX_HW_ATTR_OFST_SESSION_COUNTER;

         }

 

         desc->hlid = hlid;

-        if (is_dummy)

+        if (is_dummy || !wlvif)

                 rate_idx = 0;

         else if (wlvif->bss_type != BSS_TYPE_AP_BSS) {

                 /* if the packets are destined for AP (have a STA entry)

@@ -433,7 +434,7 @@ static int wl1271_prepare_tx_frame(struct wl1271 *wl, struct wl12xx_vif *wlvif,

 

         wl1271_tx_fill_hdr(wl, wlvif, skb, extra, info, hlid);

 

-        if (!is_dummy && wlvif->bss_type == BSS_TYPE_AP_BSS) {

+        if (!is_dummy && wlvif && wlvif->bss_type == BSS_TYPE_AP_BSS) {

                 wl1271_tx_ap_update_inconnection_sta(wl, skb);

                 wl1271_tx_regulate_link(wl, wlvif, hlid);

         }

@@ -610,6 +611,9 @@ static struct sk_buff *wl1271_skb_dequeue(struct wl1271 *wl)

                 }

         }

 

+        if (!skb)

+                skb = wl12xx_lnk_skb_dequeue(wl, &wl->links[wl->system_hlid]);

+

         if (!skb &&

             test_and_clear_bit(WL1271_FLAG_DUMMY_PACKET_PENDING, &wl->flags)) {

                 int q;

@@ -703,19 +707,14 @@ void wl1271_tx_work_locked(struct wl1271 *wl)

                 return;

 

         while ((skb = wl1271_skb_dequeue(wl))) {

+                struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

                 bool has_data = false;

 

                 wlvif = NULL;

-                if (!wl12xx_is_dummy_packet(wl, skb)) {

-                        struct ieee80211_tx_info *info;

-                        struct ieee80211_vif *vif;

+                if (!wl12xx_is_dummy_packet(wl, skb) && info->control.vif)

+                        wlvif = wl12xx_vif_to_data(info->control.vif);

 

-                        info = IEEE80211_SKB_CB(skb);

-                        vif = info->control.vif;

-                        wlvif = wl12xx_vif_to_data(vif);

-                }

                 has_data = wlvif && wl1271_tx_is_data_present(skb);

-

                 ret = wl1271_prepare_tx_frame(wl, wlvif, skb, buf_offset);

                 if (ret == -EAGAIN) {

                         /*

Re: [Announce] kernel-plus for Harmattan

2.6.32.61-plus r4
This is a major release.
Includes ExFAT
Unified EXT2/3/4 fs driver

Does this mean that you don't need to care about:
- Formatting MyDocs into ext3 or ext4 :
and by that you can exceed the 4GB limit of space for programs (OS')?

If it's FAT it's crap and limited to 4gb max file size... ;)

Re: [Announce] kernel-plus for Harmattan

Quote:

Originally Posted by Garp (Post 1387540)

Does this mean that you don't need to care about:
- Formatting MyDocs into ext3 or ext4 :
and by that you can exceed the 4GB limit of space for programs (OS')?

You still need to reformat MyDocs to ExFAT, and edit /etc/fstab.

Also make sure you're using the newest ubiboot!

As for the 4GB limit: no.
If it makes you feel any better, you can use Ubiboot to backup /home, delete the /home partition (4GB for configs!), expand /, copy /home onto say /.home on the rootfs, then change fstab to bindmount /.home onto /home

You could do without the bindmounting and just put home on /home, but the free space meter would b0rk.

Quote:

One step closer to perfect :)
http://www.spinics.net/lists/linux-w.../msg78413.html

Unfortunately, this patch does not apply at all to 2.6.32.61.
I think the wl1271 driver it's patching against is a lot newer. Time to port the newer kernel driver in?

The struct first appears in mainline with Linux 3.3

Re: [Announce] kernel-plus for Harmattan

Quote:

Originally Posted by Hurrian (Post 1387255)

Healed up just fine - a bit of scarring, but it's a lesson ;)

~~I think I'll add K+ v4 to my Github - it'll be there soon enough, once I diff and tag everything up nicely.~~

It's on GH - if anyone wants code added, you can fork it and send a pull request, or send me a patchfile.

Thank I also forked it to the harmattan team too , for visibillty and cooperation too :

https://github.com/harmattan/kernel-plus-harmattan

Re: [Announce] kernel-plus for Harmattan

Quote:

Originally Posted by www.rzr.online.fr (Post 1387767)

Thank I also forked it to the harmattan team too , for visibillty and cooperation too

Add me to the Harmattan team and I'll start committing to the repo on there!

Also, change the default branch to harmattan-2632 ;)

Re: [Announce] kernel-plus for Harmattan

Quote:

Originally Posted by trafick (Post 1387815)

servis manual will help in kernel development?

Well the last page does, where it gives out the serial connection pins under simtray. :)

Re: [Announce] kernel-plus for Harmattan

Quote:

Originally Posted by juiceme (Post 1387822)

Well the last page does, where it gives out the serial connection pins under simtray. :)

what's this?
http://s5.hostingkartinok.com/upload...1f549fc765.jpg

Re: [Announce] kernel-plus for Harmattan

Quote:

Originally Posted by trafick (Post 1387826)

what's this?[/url]

That's just the SIMcard connector.
The serial pins I was talking about are not in the connector, they are on the board next to the connector